sw/source/ui/chrdlg/swuiccoll.cxx | 34 +++++++++++++++++-----------------
sw/source/uibase/inc/swuiccoll.hxx | 12 ++++++------
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit b13dea51e44ce7bdd1a2c3f4ca9f33e9cf6ca302
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed May 20 08:53:43 2015 +0200
sw: prefix members of SwCondCollPage
Change-Id: I8e290ab6264dff4d361e1dc0eee6b69a14512d03
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 6989e6e..4b8f894 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -39,7 +39,7 @@
#include "swuiccoll.hxx"
-const sal_uInt16 SwCondCollPage::aPageRg[] = {
+const sal_uInt16 SwCondCollPage::m_aPageRg[] = {
FN_COND_COLL, FN_COND_COLL,
0
};
@@ -54,11 +54,11 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const
SfxItemSet &rSet)
: SfxTabPage(pParent, "ConditionPage",
"modules/swriter/ui/conditionpage.ui", &rSet)
,
- rSh(::GetActiveView()->GetWrtShell()),
- pCmds( SwCondCollItem::GetCmds() ),
- pFmt(0),
+ m_rSh(::GetActiveView()->GetWrtShell()),
+ m_pCmds( SwCondCollItem::GetCmds() ),
+ m_pFmt(0),
- bNewTemplate(false)
+ m_bNewTemplate(false)
{
get(m_pConditionCB, "condstyle");
get(m_pContextFT, "contextft");
@@ -174,21 +174,21 @@ bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
void SwCondCollPage::Reset(const SfxItemSet *)
{
- if(bNewTemplate)
+ if(m_bNewTemplate)
m_pConditionCB->Enable();
- if(RES_CONDTXTFMTCOLL == pFmt->Which())
+ if(RES_CONDTXTFMTCOLL == m_pFmt->Which())
m_pConditionCB->Check();
OnOffHdl(m_pConditionCB);
m_pTbLinks->Clear();
- SfxStyleSheetBasePool* pPool =
rSh.GetView().GetDocShell()->GetStyleSheetPool();
+ SfxStyleSheetBasePool* pPool =
m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL);
m_pStyleLB->Clear();
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
{
- if(!pFmt || pBase->GetName() != pFmt->GetName())
+ if(!m_pFmt || pBase->GetName() != m_pFmt->GetName())
m_pStyleLB->InsertEntry(pBase->GetName());
pBase = pPool->Next();
}
@@ -199,9 +199,9 @@ void SwCondCollPage::Reset(const SfxItemSet *)
OUString aEntry( m_aStrArr[n] + "\t" );
const SwCollCondition* pCond = 0;
- if( pFmt && RES_CONDTXTFMTCOLL == pFmt->Which() &&
- 0 != ( pCond = static_cast<SwConditionTxtFmtColl*>(pFmt)->
- HasCondition( SwCollCondition( 0, pCmds[n].nCnd, pCmds[n].nSubCond
) ) )
+ if( m_pFmt && RES_CONDTXTFMTCOLL == m_pFmt->Which() &&
+ 0 != ( pCond = static_cast<SwConditionTxtFmtColl*>(m_pFmt)->
+ HasCondition( SwCollCondition( 0, m_pCmds[n].nCnd,
m_pCmds[n].nSubCond ) ) )
&& pCond->GetTxtFmtColl() )
{
aEntry += pCond->GetTxtFmtColl()->GetName();
@@ -265,13 +265,13 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
m_pStyleLB->Clear();
const sal_Int32 nSelPos = pBox->GetSelectEntryPos();
const sal_uInt16 nSearchFlags =
*static_cast<sal_uInt16*>(m_pFilterLB->GetEntryData(nSelPos));
- SfxStyleSheetBasePool* pPool =
rSh.GetView().GetDocShell()->GetStyleSheetPool();
+ SfxStyleSheetBasePool* pPool =
m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags);
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
{
- if(!pFmt || pBase->GetName() != pFmt->GetName())
+ if(!m_pFmt || pBase->GetName() != m_pFmt->GetName())
m_pStyleLB->InsertEntry(pBase->GetName());
pBase = pPool->Next();
}
@@ -295,10 +295,10 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
return 0;
}
-void SwCondCollPage::SetCollection(SwFmt* pNewFormat, bool bNew)
+void SwCondCollPage::SetCollection(SwFmt* pFormat, bool bNew)
{
- pFmt = pNewFormat;
- bNewTemplate = bNew;
+ m_pFmt = pFormat;
+ m_bNewTemplate = bNew;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swuiccoll.hxx
b/sw/source/uibase/inc/swuiccoll.hxx
index a66a468..fadb565 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -41,11 +41,11 @@ class SwCondCollPage : public SfxTabPage
std::vector<OUString> m_aStrArr;
- SwWrtShell &rSh;
- const CommandStruct*pCmds;
- SwFmt* pFmt;
+ SwWrtShell &m_rSh;
+ const CommandStruct*m_pCmds;
+ SwFmt* m_pFmt;
- bool bNewTemplate;
+ bool m_bNewTemplate;
virtual ~SwCondCollPage();
virtual void dispose() SAL_OVERRIDE;
@@ -59,13 +59,13 @@ class SwCondCollPage : public SfxTabPage
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- static const sal_uInt16 aPageRg[];
+ static const sal_uInt16 m_aPageRg[];
public:
SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet);
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet
*rSet);
- static const sal_uInt16* GetRanges() { return aPageRg; }
+ static const sal_uInt16* GetRanges() { return m_aPageRg; }
virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE;
virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
