summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-09-20 08:16:52 +0200
committerMiklos Vajna <vmiklos@collabora.com>2021-09-20 11:09:46 +0200
commit499e4b2e56282fe2df9f6383652359206d2c9fcf (patch)
tree0ab87fe1496138dcbf6888f32f55dd61c0c20bf7 /sw/source/uibase/inc
parent5b3bf3306797271c90df5a4a00463d327a65e96b (diff)
sw: prefix members of SwNavigationConfig, SwNumRulesWithName and SwSrcView
See tdf#94879 for motivation. Change-Id: I2740ff914fe35a069ce67ad10783dadc0cfdbf74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122339 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sw/source/uibase/inc')
-rw-r--r--sw/source/uibase/inc/navicfg.hxx50
-rw-r--r--sw/source/uibase/inc/srcview.hxx12
-rw-r--r--sw/source/uibase/inc/uinums.hxx8
3 files changed, 35 insertions, 35 deletions
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 43bf52b3d7ed..07c167de804b 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.hxx
@@ -26,13 +26,13 @@ enum class ContentTypeId;
class SwNavigationConfig final : public utl::ConfigItem
{
- ContentTypeId nRootType; //RootType
- sal_Int32 nSelectedPos; //SelectedPosition
- sal_Int32 nOutlineLevel; //OutlineLevel
- RegionMode nRegionMode; //InsertMode
- sal_Int32 nActiveBlock; //ActiveBlock//Expand/CollapsState
- bool bIsSmall; //ShowListBox
- bool bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
+ ContentTypeId m_nRootType; //RootType
+ sal_Int32 m_nSelectedPos; //SelectedPosition
+ sal_Int32 m_nOutlineLevel; //OutlineLevel
+ RegionMode m_nRegionMode; //InsertMode
+ sal_Int32 m_nActiveBlock; //ActiveBlock//Expand/CollapsState
+ bool m_bIsSmall; //ShowListBox
+ bool m_bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
static css::uno::Sequence<OUString> GetPropertyNames();
@@ -44,57 +44,57 @@ public:
virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
- ContentTypeId GetRootType()const {return nRootType;}
+ ContentTypeId GetRootType()const {return m_nRootType;}
void SetRootType(ContentTypeId nSet){
- if(nRootType != nSet)
+ if(m_nRootType != nSet)
{
SetModified();
- nRootType = nSet;
+ m_nRootType = nSet;
}
}
- sal_Int32 GetOutlineLevel()const {return nOutlineLevel;}
+ sal_Int32 GetOutlineLevel()const {return m_nOutlineLevel;}
void SetOutlineLevel(sal_Int32 nSet){
- if(nOutlineLevel != nSet)
+ if(m_nOutlineLevel != nSet)
{
SetModified();
- nOutlineLevel = nSet;
+ m_nOutlineLevel = nSet;
}
}
- RegionMode GetRegionMode()const {return nRegionMode;}
+ RegionMode GetRegionMode()const {return m_nRegionMode;}
void SetRegionMode(RegionMode nSet){
- if(nRegionMode != nSet)
+ if(m_nRegionMode != nSet)
{
SetModified();
- nRegionMode = nSet;
+ m_nRegionMode = nSet;
}
}
- sal_Int32 GetActiveBlock()const {return nActiveBlock;}
+ sal_Int32 GetActiveBlock()const {return m_nActiveBlock;}
void SetActiveBlock(sal_Int32 nSet){
- if(nActiveBlock != nSet)
+ if(m_nActiveBlock != nSet)
{
SetModified();
- nActiveBlock = nSet;
+ m_nActiveBlock = nSet;
}
}
- bool IsSmall() const {return bIsSmall;}
+ bool IsSmall() const {return m_bIsSmall;}
void SetSmall(bool bSet){
- if(bIsSmall != bSet)
+ if(m_bIsSmall != bSet)
{
SetModified();
- bIsSmall = bSet;
+ m_bIsSmall = bSet;
}
}
- bool IsGlobalActive() const {return bIsGlobalActive;}
+ bool IsGlobalActive() const {return m_bIsGlobalActive;}
void SetGlobalActive(bool bSet){
- if(bIsGlobalActive != bSet)
+ if(m_bIsGlobalActive != bSet)
{
SetModified();
- bIsGlobalActive = bSet;
+ m_bIsGlobalActive = bSet;
}
}
};
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index f58712b57e59..caaecad67d6d 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -32,12 +32,12 @@ class SfxMedium;
class SwSrcView final : public SfxViewShell
{
- VclPtr<SwSrcEditWindow> aEditWin;
+ VclPtr<SwSrcEditWindow> m_aEditWin;
- std::unique_ptr<SvxSearchItem> pSearchItem;
+ std::unique_ptr<SvxSearchItem> m_pSearchItem;
- bool bSourceSaved :1;
- rtl_TextEncoding eLoadEncoding;
+ bool m_bSourceSaved :1;
+ rtl_TextEncoding m_eLoadEncoding;
void Init();
// for read-only switching
@@ -64,7 +64,7 @@ public:
void SaveContent(const OUString& rTmpFile);
void SaveContentTo(SfxMedium& rMed);
- bool IsModified() const {return aEditWin->IsModified();}
+ bool IsModified() const {return m_aEditWin->IsModified();}
void Execute(SfxRequest&);
void GetState(SfxItemSet&);
@@ -79,7 +79,7 @@ public:
sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly );
- bool HasSourceSaved() const {return bSourceSaved;}
+ bool HasSourceSaved() const {return m_bSourceSaved;}
};
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 37e36feae634..54dd1c2a0f4b 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -41,9 +41,9 @@ class SW_DLLPUBLIC SwNumRulesWithName final
class SAL_DLLPRIVATE SwNumFormatGlobal
{
friend class SwNumRulesWithName;
- SwNumFormat aFormat;
- OUString sCharFormatName;
- sal_uInt16 nCharPoolId;
+ SwNumFormat m_aFormat;
+ OUString m_sCharFormatName;
+ sal_uInt16 m_nCharPoolId;
std::vector<std::unique_ptr<SfxPoolItem>> m_Items;
SwNumFormatGlobal& operator=( const SwNumFormatGlobal& ) = delete;
@@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwNumRulesWithName final
SwNumFormat MakeNumFormat(SwWrtShell& rSh) const;
};
- std::unique_ptr<SwNumFormatGlobal> aFormats[ MAXLEVEL ];
+ std::unique_ptr<SwNumFormatGlobal> m_aFormats[ MAXLEVEL ];
friend class sw::StoredChapterNumberingRules;
friend class SwChapterNumRules;