sw/source/filter/ww8/ww8toolbar.cxx | 10 +++++-----
sw/source/filter/ww8/ww8toolbar.hxx | 8 ++++----
sw/source/ui/chrdlg/chardlg.cxx | 16 ++++++++--------
sw/source/ui/chrdlg/numpara.cxx | 22 +++++++++++-----------
sw/source/uibase/inc/chrdlg.hxx | 2 +-
sw/source/uibase/inc/numpara.hxx | 8 ++++----
6 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit ebed8dc382817b8f356d090ac4794a3eee8f1f0f
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 25 08:03:36 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jul 25 08:46:42 2022 +0200
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 <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index f6639bd716d3..32507e828c16 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -613,7 +613,7 @@ Xst::Read( SvStream& rS )
{
SAL_INFO("sw.ww8","Xst::Read() stream pos 0x" << std::hex << rS.Tell() );
nOffSet = rS.Tell();
- sString = read_uInt16_PascalString(rS);
+ m_sString = read_uInt16_PascalString(rS);
return rS.good();
}
@@ -928,7 +928,7 @@ bool MacroName::Read(SvStream &rS)
return m_xstz.Read( rS );
}
-Xstz::Xstz():chTerm(0)
+Xstz::Xstz():m_chTerm(0)
{
}
@@ -937,10 +937,10 @@ Xstz::Read(SvStream &rS)
{
SAL_INFO("sw.ww8","Xstz::Read() stream pos 0x" << std::hex << rS.Tell() );
nOffSet = rS.Tell();
- if ( !xst.Read( rS ) )
+ if ( !m_xst.Read( rS ) )
return false;
- rS.ReadUInt16( chTerm );
- if ( chTerm != 0 ) // should be an assert
+ rS.ReadUInt16( m_chTerm );
+ if ( m_chTerm != 0 ) // should be an assert
return false;
return rS.good();
}
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx
b/sw/source/filter/ww8/ww8toolbar.hxx
index 00a52806f21f..2d6876744ccf 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -19,12 +19,12 @@ class SwCTBWrapper;
class Xst : public TBBase
{
- OUString sString;
+ OUString m_sString;
public:
Xst(){}
bool Read(SvStream &rS) override;
- const OUString& getString() const { return sString; }
+ const OUString& getString() const { return m_sString; }
};
class SwTBC : public TBBase
@@ -273,8 +273,8 @@ public:
class Xstz : public TBBase
{
- Xst xst; //An Xst specifying the string with its pre-pended length.
- sal_uInt16 chTerm;
+ Xst m_xst; //An Xst specifying the string with its pre-pended length.
+ sal_uInt16 m_chTerm;
Xstz(const Xstz&) = delete;
Xstz& operator = ( const Xstz&) = delete;
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);
}
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index 687d16e0cfd9..d07344046903 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -43,7 +43,7 @@ public:
class SwCharURLPage final : public SfxTabPage
{
std::optional<SvxMacroTableDtor> m_oINetMacroTable;
- bool bModified;
+ bool m_bModified;
std::unique_ptr<weld::Entry> m_xURLED;
std::unique_ptr<weld::Label> m_xTextFT;
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index cf43a1b6b155..ca07da56480d 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -29,8 +29,8 @@ class SwParagraphNumTabPage final : public SfxTabPage
// #outlinelevel#
const OUString msOutlineNumbering;
- bool bModified : 1;
- bool bCurNumrule : 1;
+ bool m_bModified : 1;
+ bool m_bCurNumrule : 1;
std::unique_ptr<weld::Widget> m_xOutlineStartBX;
std::unique_ptr<weld::ComboBox> m_xOutlineLvLB;
@@ -56,7 +56,7 @@ class SwParagraphNumTabPage final : public SfxTabPage
DECL_LINK(EditNumStyleHdl_Impl, weld::Button&, void);
DECL_LINK(EditNumStyleSelectHdl_Impl, weld::ComboBox&, void);
- static const WhichRangesContainer aPageRg;
+ static const WhichRangesContainer s_aPageRg;
bool ExecuteEditNumStyle_Impl(sal_uInt16 nId, const OUString& rStr,
SfxStyleFamily nFamily);
@@ -67,7 +67,7 @@ public:
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage,
weld::DialogController* pController,
const SfxItemSet* rSet );
- static WhichRangesContainer GetRanges() { return aPageRg; }
+ static WhichRangesContainer GetRanges() { return s_aPageRg; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
