sw: prefix members of SwInsertBookmarkDlg, SwNumPositionTabPage, ...

... SwOutlineSettingsTabPage and SwSortDlg

See tdf#94879 for motivation.

Change-Id: Idcc0425cd65b908ec6b92b9689d441fd185e51a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140899
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

4 files changed, 28 insertions, 28 deletions

diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index 4c1a9a2e79b9..51aea63748cd 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -67,8 +67,8 @@ public:
 
 class SwInsertBookmarkDlg final : public SfxDialogController
 {
-    SwWrtShell&                         rSh;
-    std::vector<std::pair<sw::mark::IMark*, OUString>> aTableBookmarks;
+    SwWrtShell&                         m_rSh;
+    std::vector<std::pair<sw::mark::IMark*, OUString>> m_aTableBookmarks;
     sal_Int32                           m_nLastBookmarksCount;
     bool                                m_bSorted;
     bool m_bAreProtected;
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 781023f0a949..463e8ea01b96 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -29,17 +29,17 @@ class SwOutlineTabDialog;
 
 class SwNumPositionTabPage final : public SfxTabPage
 {
-    std::unique_ptr<SwNumRule> pActNum;
-    SwNumRule*          pSaveNum;
-    SwWrtShell*         pWrtSh;
+    std::unique_ptr<SwNumRule> m_pActNum;
+    SwNumRule*          m_pSaveNum;
+    SwWrtShell*         m_pWrtSh;
 
-    SwOutlineTabDialog* pOutlineDlg;
-    sal_uInt16          nActNumLvl;
+    SwOutlineTabDialog* m_pOutlineDlg;
+    sal_uInt16          m_nActNumLvl;
 
-    bool                bModified           : 1;
-    bool                bPreset             : 1;
-    bool                bInInintControl     : 1;  // work around modify-error; should be resolved from 391 on
-    bool                bLabelAlignmentPosAndSpaceModeActive;
+    bool                m_bModified           : 1;
+    bool                m_bPreset             : 1;
+    bool                m_bInInintControl     : 1;  // work around modify-error; should be resolved from 391 on
+    bool                m_bLabelAlignmentPosAndSpaceModeActive;
 
     NumberingPreview  m_aPreviewWIN;
 
@@ -103,15 +103,15 @@ public:
     static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
                                       const SfxItemSet* rAttrSet);
 
-    void                SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
+    void                SetOutlineTabDialog(SwOutlineTabDialog* pDlg){m_pOutlineDlg = pDlg;}
     void                SetWrtShell(SwWrtShell* pSh);
 #ifdef DBG_UTIL
     void                SetModified();
 #else
     void                SetModified()
     {
-        bModified = true;
-        m_aPreviewWIN.SetLevel(nActNumLvl);
+        m_bModified = true;
+        m_aPreviewWIN.SetLevel(m_nActNumLvl);
         m_aPreviewWIN.Invalidate();
     }
 #endif
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 6d9a23ab506a..1b1d76ccccd9 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -65,12 +65,12 @@ public:
 
 class SwOutlineSettingsTabPage final : public SfxTabPage
 {
-    OUString            aNoFormatName;
-    OUString            aSaveCollNames[MAXLEVEL];
-    SwWrtShell*         pSh;
-    SwNumRule*          pNumRule;
-    OUString*           pCollNames;
-    sal_uInt16          nActLevel;
+    OUString            m_aNoFormatName;
+    OUString            m_aSaveCollNames[MAXLEVEL];
+    SwWrtShell*         m_pSh;
+    SwNumRule*          m_pNumRule;
+    OUString*           m_pCollNames;
+    sal_uInt16          m_nActLevel;
     NumberingPreview  m_aPreviewWIN;
 
     std::unique_ptr<weld::TreeView> m_xLevelLB;
@@ -113,8 +113,8 @@ public:
     virtual void        Reset( const SfxItemSet* rSet ) override;
     void SetNumRule(SwNumRule *pRule)
     {
-        pNumRule = pRule;
-        m_aPreviewWIN.SetNumRule(pNumRule);
+        m_pNumRule = pRule;
+        m_aPreviewWIN.SetNumRule(m_pNumRule);
     }
 };
 
diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx
index 2b6a39092f5b..590988735405 100644
--- a/sw/source/uibase/inc/srtdlg.hxx
+++ b/sw/source/uibase/inc/srtdlg.hxx
@@ -60,15 +60,15 @@ class SwSortDlg final : public weld::GenericDialogController
 
     std::unique_ptr<weld::CheckButton> m_xCaseCB;
 
-    OUString aColText;
-    OUString aRowText;
-    OUString aNumericText;
+    OUString m_aColText;
+    OUString m_aRowText;
+    OUString m_aNumericText;
 
-    SwWrtShell& rSh;
+    SwWrtShell& m_rSh;
     std::unique_ptr<CollatorResource> m_xColRes;
 
-    sal_uInt16 nX;
-    sal_uInt16 nY;
+    sal_uInt16 m_nX;
+    sal_uInt16 m_nY;
 
     void Apply();
     sal_Unicode GetDelimChar() const;