sw: prefix members of SwCharURLPage, SwParagraphNumTabPage, Xst and Xstz

See tdf#94879 for motivation.

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

2 files changed, 19 insertions, 19 deletions

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index b7564dc414a9..0cf38a652bec 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -137,7 +137,7 @@ void SwCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
 
 SwCharURLPage::SwCharURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
     : SfxTabPage(pPage, pController, "modules/swriter/ui/charurlpage.ui", "CharURLPage", &rCoreSet)
-    , bModified(false)
+    , m_bModified(false)
     , m_xURLED(m_xBuilder->weld_entry("urled"))
     , m_xTextFT(m_xBuilder->weld_label("textft"))
     , m_xTextED(m_xBuilder->weld_entry("texted"))
@@ -253,7 +253,7 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
     bool bURLModified = m_xURLED->get_value_changed_from_saved();
     bool bNameModified = m_xNameED->get_value_changed_from_saved();
     bool bTargetModified = m_xTargetFrameLB->get_value_changed_from_saved();
-    bModified = bURLModified || bNameModified || bTargetModified;
+    m_bModified = bURLModified || bNameModified || bTargetModified;
 
     // set valid settings first
     OUString sEntry = m_xVisitedLB->get_active_text();
@@ -268,19 +268,19 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
         aINetFormat.SetMacroTable(&*m_oINetMacroTable);
 
     if (m_xVisitedLB->get_value_changed_from_saved())
-        bModified = true;
+        m_bModified = true;
 
     if (m_xNotVisitedLB->get_value_changed_from_saved())
-        bModified = true;
+        m_bModified = true;
 
     if (bNameModified)
     {
-        bModified = true;
+        m_bModified = true;
         rSet->Put(SfxStringItem(FN_PARAM_SELECTION, m_xTextED->get_text()));
     }
-    if(bModified)
+    if(m_bModified)
         rSet->Put(aINetFormat);
-    return bModified;
+    return m_bModified;
 }
 
 std::unique_ptr<SfxTabPage> SwCharURLPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
@@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, weld::Button&, void)
 
 IMPL_LINK_NOARG(SwCharURLPage, EventHdl, weld::Button&, void)
 {
-    bModified |= SwMacroAssignDlg::INetFormatDlg(GetFrameWeld(),
+    m_bModified |= SwMacroAssignDlg::INetFormatDlg(GetFrameWeld(),
                     ::GetActiveView()->GetWrtShell(), m_oINetMacroTable);
 }
 
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index f67627b2dad0..8df5c28e5810 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -33,13 +33,13 @@
 #include <sfx2/frame.hxx>
 #include <sfx2/viewsh.hxx>
 
-const WhichRangesContainer SwParagraphNumTabPage::aPageRg(svl::Items<FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT>);
+const WhichRangesContainer SwParagraphNumTabPage::s_aPageRg(svl::Items<FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT>);
 
 SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
     : SfxTabPage(pPage, pController, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr)
     , msOutlineNumbering(SwResId(STR_OUTLINE_NUMBERING ))
-    , bModified(false)
-    , bCurNumrule(false)
+    , m_bModified(false)
+    , m_bCurNumrule(false)
     , m_xOutlineStartBX(m_xBuilder->weld_widget("boxOUTLINE"))
     , m_xOutlineLvLB(m_xBuilder->weld_combo_box("comboLB_OUTLINE_LEVEL"))
     , m_xNumberStyleBX(m_xBuilder->weld_widget("boxNUMBER_STYLE"))
@@ -104,7 +104,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
             std::unique_ptr<SfxUInt16Item> pOutlineLv(pOldOutlineLv->Clone());
             pOutlineLv->SetValue( aOutlineLv );
             rSet->Put(std::move(pOutlineLv));
-            bModified = true;
+            m_bModified = true;
         }
     }
 
@@ -119,14 +119,14 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
             std::unique_ptr<SfxStringItem> pRule(pOldRule->Clone());
             pRule->SetValue(aStyle);
             rSet->Put(std::move(pRule));
-            bModified = true;
+            m_bModified = true;
         }
     }
     if (m_xNewStartCB->get_state_changed_from_saved() ||
         m_xNewStartNumberCB->get_state_changed_from_saved()||
         m_xNewStartNF->get_value_changed_from_saved())
     {
-        bModified = true;
+        m_bModified = true;
         bool bNewStartChecked = TRISTATE_TRUE == m_xNewStartCB->get_state();
         bool bNumberNewStartChecked = TRISTATE_TRUE == m_xNewStartNumberCB->get_state();
         rSet->Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked));
@@ -143,9 +143,9 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
                                 m_xRestartNF->get_value() : 0 ));
         aFormat.SetCountLines(m_xCountParaCB->get_active());
         rSet->Put(aFormat);
-        bModified = true;
+        m_bModified = true;
     }
-    return bModified;
+    return m_bModified;
 }
 
 void SwParagraphNumTabPage::ChangesApplied()
@@ -212,7 +212,7 @@ void SwParagraphNumTabPage::Reset(const SfxItemSet* rSet)
     eItemState = rSet->GetItemState( FN_NUMBER_NEWSTART );
     if(eItemState > SfxItemState::DEFAULT )
     {
-        bCurNumrule = true;
+        m_bCurNumrule = true;
         const SfxBoolItem& rStart = static_cast<const SfxBoolItem&>(rSet->Get(FN_NUMBER_NEWSTART));
 
         m_xNewStartCB->set_state(rStart.GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
@@ -255,7 +255,7 @@ void SwParagraphNumTabPage::Reset(const SfxItemSet* rSet)
     m_xRestartParaCountCB->save_state();
     m_xRestartNF->save_value();
 
-    bModified = false;
+    m_bModified = false;
 }
 
 void SwParagraphNumTabPage::DisableOutline()
@@ -341,7 +341,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(
 
 IMPL_LINK(SwParagraphNumTabPage, StyleHdl_Impl, weld::ComboBox&, rBox, void)
 {
-    bool bEnable = bCurNumrule || rBox.get_active() > 0;
+    bool bEnable = m_bCurNumrule || rBox.get_active() > 0;
     m_xNewStartCB->set_sensitive(bEnable);
     NewStartHdl_Impl(*m_xNewStartCB);
 }