sw/source/ui/frmdlg/frmpage.cxx | 2 +-
sw/source/ui/frmdlg/wrap.cxx | 2 +-
sw/source/ui/index/cnttab.cxx | 32 ++++++++++++++++----------------
sw/source/uibase/inc/frmpage.hxx | 4 ++--
sw/source/uibase/inc/wrap.hxx | 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 223d0eccaceb1208c5b51d83b4df431a9bed2bbe
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 14 08:12:36 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 14 12:17:55 2022 +0100
sw: prefix members of SwAddStylesDlg_Impl, SwAutoMarkDlg_Impl, ...
... SwFramePage and SwWrapTabPage
See tdf#94879 for motivation.
Change-Id: I6f15fee117b9c05aeae7dfbb0b49c30d49018d49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142667
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index ec687f02149e..2bb7b0af5705 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -386,7 +386,7 @@ FrameMap const aVAsCharHtmlMap[] =
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT,
text::VertOrientation::LINE_CENTER, LB::RelRow}
};
-const WhichRangesContainer SwFramePage::aPageRg(svl::Items<
+const WhichRangesContainer SwFramePage::s_aPageRg(svl::Items<
RES_FRM_SIZE, RES_FRM_SIZE,
RES_VERT_ORIENT, RES_ANCHOR,
RES_COL, RES_COL,
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index a03ddff953be..be60343e39b4 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -44,7 +44,7 @@
using namespace ::com::sun::star;
-const WhichRangesContainer SwWrapTabPage::m_aWrapPageRg(svl::Items<
+const WhichRangesContainer SwWrapTabPage::s_aWrapPageRg(svl::Items<
RES_LR_SPACE, RES_UL_SPACE,
RES_PRINT, RES_PRINT,
RES_PROTECT, RES_SURROUND
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index af0cc16dbd0b..15158f4e41f3 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -174,8 +174,8 @@ public:
class SwAutoMarkDlg_Impl : public weld::GenericDialogController
{
- OUString sAutoMarkURL;
- bool bCreateMode;
+ OUString m_sAutoMarkURL;
+ bool m_bCreateMode;
std::unique_ptr<weld::Button> m_xOKPB;
std::unique_ptr<weld::Container> m_xTable;
@@ -474,7 +474,7 @@ namespace {
class SwAddStylesDlg_Impl : public SfxDialogController
{
- OUString* pStyleArr;
+ OUString* m_pStyleArr;
std::unique_ptr<weld::Button> m_xOk;
std::unique_ptr<weld::Button> m_xLeftPB;
@@ -499,7 +499,7 @@ public:
SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(weld::Window* pParent,
SwWrtShell const & rWrtSh, OUString rStringArr[])
: SfxDialogController(pParent, "modules/swriter/ui/assignstylesdialog.ui",
"AssignStylesDialog")
- , pStyleArr(rStringArr)
+ , m_pStyleArr(rStringArr)
, m_xOk(m_xBuilder->weld_button("ok"))
, m_xLeftPB(m_xBuilder->weld_button("left"))
, m_xRightPB(m_xBuilder->weld_button("right"))
@@ -681,7 +681,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, KeyInput, const KeyEvent&,
rKEvt, bool)
IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl, weld::Button&, void)
{
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
- pStyleArr[i].clear();
+ m_pStyleArr[i].clear();
int nChildren = m_xHeaderTree->n_children();
for (int i = 0; i < nChildren; ++i)
@@ -698,9 +698,9 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl, weld::Button&,
void)
if (nToggleColumn)
{
int nLevel = nToggleColumn - 1;
- if(!pStyleArr[nLevel].isEmpty())
- pStyleArr[nLevel] += OUStringChar(TOX_STYLE_DELIMITER);
- pStyleArr[nLevel] += m_xHeaderTree->get_text(i, 0);
+ if(!m_pStyleArr[nLevel].isEmpty())
+ m_pStyleArr[nLevel] += OUStringChar(TOX_STYLE_DELIMITER);
+ m_pStyleArr[nLevel] += m_xHeaderTree->get_text(i, 0);
}
}
@@ -3983,8 +3983,8 @@ bool SwEntryBrowseBox::IsModified()const
SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(weld::Window* pParent, OUString
aAutoMarkURL,
bool bCreate)
: GenericDialogController(pParent,
"modules/swriter/ui/createautomarkdialog.ui", "CreateAutomarkDialog")
- , sAutoMarkURL(std::move(aAutoMarkURL))
- , bCreateMode(bCreate)
+ , m_sAutoMarkURL(std::move(aAutoMarkURL))
+ , m_bCreateMode(bCreate)
, m_xOKPB(m_xBuilder->weld_button("ok"))
, m_xTable(m_xBuilder->weld_container("area"))
, m_xTableCtrlParent(m_xTable->CreateChildFrame())
@@ -3993,13 +3993,13 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(weld::Window*
pParent, OUString aAutoMark
m_xEntriesBB->Show();
m_xOKPB->connect_clicked(LINK(this, SwAutoMarkDlg_Impl, OkHdl));
- m_xDialog->set_title(m_xDialog->get_title() + ": " + sAutoMarkURL);
+ m_xDialog->set_title(m_xDialog->get_title() + ": " + m_sAutoMarkURL);
bool bError = false;
- if( bCreateMode )
+ if( m_bCreateMode )
m_xEntriesBB->RowInserted(0);
else
{
- SfxMedium aMed( sAutoMarkURL, StreamMode::STD_READ );
+ SfxMedium aMed( m_sAutoMarkURL, StreamMode::STD_READ );
if( aMed.GetInStream() && !aMed.GetInStream()->GetError() )
m_xEntriesBB->ReadEntries( *aMed.GetInStream() );
else
@@ -4023,10 +4023,10 @@ SwAutoMarkDlg_Impl::~SwAutoMarkDlg_Impl()
IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl, weld::Button&, void)
{
bool bError = false;
- if (m_xEntriesBB->IsModified() || bCreateMode)
+ if (m_xEntriesBB->IsModified() || m_bCreateMode)
{
- SfxMedium aMed( sAutoMarkURL,
- bCreateMode ? StreamMode::WRITE
+ SfxMedium aMed( m_sAutoMarkURL,
+ m_bCreateMode ? StreamMode::WRITE
: StreamMode::WRITE| StreamMode::TRUNC );
SvStream* pStrm = aMed.GetOutStream();
// tdf#108910, tdf#125496 - write index entries using the utf8 text
encoding
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 69c13a5c96e6..659c97f291bf 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -173,14 +173,14 @@ class SwFramePage final : public SfxTabPage
SwWrtShell *getFrameDlgParentShell();
- static const WhichRangesContainer aPageRg;
+ static const WhichRangesContainer s_aPageRg;
public:
SwFramePage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rSet);
virtual ~SwFramePage() override;
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;
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index c947eee3a896..c249b0233c81 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -81,7 +81,7 @@ class SwWrapTabPage final : public SfxTabPage
DECL_LINK(WrapTypeHdl, weld::Toggleable&, void);
DECL_LINK(ContourHdl, weld::Toggleable&, void);
- static const WhichRangesContainer m_aWrapPageRg;
+ static const WhichRangesContainer s_aWrapPageRg;
public:
SwWrapTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rSet);
@@ -91,7 +91,7 @@ public:
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
- static WhichRangesContainer GetRanges() { return m_aWrapPageRg; }
+ static WhichRangesContainer GetRanges() { return s_aWrapPageRg; }
void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; }
void SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat =
bFormat; m_bDrawMode = bDrawMode; }
void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; }
