sw/source/ui/frmdlg/column.cxx | 2 +-
sw/source/ui/frmdlg/cption.cxx | 6 +++---
sw/source/ui/frmdlg/frmpage.cxx | 18 +++++++++---------
sw/source/uibase/inc/column.hxx | 4 ++--
sw/source/uibase/inc/cption.hxx | 2 +-
sw/source/uibase/inc/frmpage.hxx | 8 ++++----
6 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit f18ef67d7ce02ead53a6dc3c2a985d8b51b7afda
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 7 08:07:03 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 7 08:53:20 2022 +0100
sw: prefix members of SwCaptionDialog, SwColumnPage, SwFrameAddPage and ...
... SwGrfExtPage
See tdf#94879 for motivation.
Change-Id: I9ac362d2399db4ec92816bb4e34e4c2740b16eec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142365
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index e03eb2945999..5692a906e279 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -349,7 +349,7 @@ sal_uInt16 GetMaxWidth( SwColMgr const * pColMgr,
sal_uInt16 nCols )
return nMax;
}
-const WhichRangesContainer SwColumnPage::aPageRg(svl::Items<RES_COL, RES_COL>);
+const WhichRangesContainer SwColumnPage::s_aPageRg(svl::Items<RES_COL,
RES_COL>);
void SwColumnPage::ResetColWidth()
{
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 66ed8d4f293d..01ebc9d685c4 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -84,7 +84,7 @@ public:
}
-OUString SwCaptionDialog::our_aSepTextSave(": "); // Caption separator text
+OUString SwCaptionDialog::s_aSepTextSave(": "); // Caption separator text
//Resolves: tdf#47427 disallow typing *or* pasting invalid content into the
category box
OUString TextFilterAutoConvert::filter(const OUString &rText)
@@ -262,7 +262,7 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent,
SwView &rV)
ModifyHdl();
- m_xSepEdit->set_text(our_aSepTextSave);
+ m_xSepEdit->set_text(s_aSepTextSave);
m_xTextEdit->grab_focus();
DrawSample();
}
@@ -290,7 +290,7 @@ void SwCaptionDialog::Apply()
aOpt.CopyAttributes() = m_bCopyAttributes;
aOpt.SetCharacterStyle( m_sCharacterStyle );
m_rView.InsertCaption( &aOpt );
- our_aSepTextSave = m_xSepEdit->get_text();
+ s_aSepTextSave = m_xSepEdit->get_text();
}
short SwCaptionDialog::run()
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 392e1cc6ba90..ec687f02149e 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -392,7 +392,7 @@ const WhichRangesContainer SwFramePage::aPageRg(svl::Items<
RES_COL, RES_COL,
RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW
>);
-const WhichRangesContainer SwFrameAddPage::aAddPgRg(svl::Items<
+const WhichRangesContainer SwFrameAddPage::s_aAddPgRg(svl::Items<
RES_PRINT, RES_PRINT,
RES_PROTECT, RES_PROTECT,
FN_SET_FRM_NAME, FN_SET_FRM_NAME,
@@ -2420,8 +2420,8 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet)
{
if( !pGraphicBrushItem->GetGraphicLink().isEmpty() )
{
- aGrfName = aNewGrfName = pGraphicBrushItem->GetGraphicLink();
- m_xConnectED->set_text(aNewGrfName);
+ m_aGrfName = m_aNewGrfName = pGraphicBrushItem->GetGraphicLink();
+ m_xConnectED->set_text(m_aNewGrfName);
}
OUString referer;
SfxStringItem const * it = static_cast<SfxStringItem const *>(
@@ -2484,11 +2484,11 @@ bool SwGrfExtPage::FillItemSet( SfxItemSet *rSet )
rSet->Put( aMirror );
}
- if (aGrfName != aNewGrfName ||
m_xConnectED->get_value_changed_from_saved())
+ if (m_aGrfName != m_aNewGrfName ||
m_xConnectED->get_value_changed_from_saved())
{
bModified = true;
- aGrfName = m_xConnectED->get_text();
- rSet->Put( SvxBrushItem( aGrfName, aFilterName, GPOS_LT,
+ m_aGrfName = m_xConnectED->get_text();
+ rSet->Put( SvxBrushItem( m_aGrfName, m_aFilterName, GPOS_LT,
SID_ATTR_GRAF_GRAPHIC ));
}
@@ -2527,10 +2527,10 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&,
void)
return;
// remember selected filter
- aFilterName = m_xGrfDlg->GetCurrentFilter();
- aNewGrfName = INetURLObject::decode( m_xGrfDlg->GetPath(),
+ m_aFilterName = m_xGrfDlg->GetCurrentFilter();
+ m_aNewGrfName = INetURLObject::decode( m_xGrfDlg->GetPath(),
INetURLObject::DecodeMechanism::Unambiguous );
- m_xConnectED->set_text(aNewGrfName);
+ m_xConnectED->set_text(m_aNewGrfName);
//reset mirrors because maybe a Bitmap was swapped with
//another type of graphic that cannot be mirrored.
m_xMirrorVertBox->set_active(false);
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 98b335a8a78f..d45331cddfcd 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -164,14 +164,14 @@ class SwColumnPage final : public SfxTabPage
bool isLineNotNone() const;
- static const WhichRangesContainer aPageRg;
+ static const WhichRangesContainer s_aPageRg;
public:
SwColumnPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rSet);
virtual ~SwColumnPage() 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/cption.hxx b/sw/source/uibase/inc/cption.hxx
index af92ff952ca2..0a7bc9ef64c7 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -71,7 +71,7 @@ class SwCaptionDialog final : public SfxDialogController
void DrawSample();
void ApplyCaptionOrder(); //#i61007# order of captions
- static OUString our_aSepTextSave; // Save caption separator text
+ static OUString s_aSepTextSave; // Save caption separator text
public:
SwCaptionDialog(weld::Window* pParent, SwView& rV);
virtual short run() override;
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 1e01a6fa100d..69c13a5c96e6 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -194,8 +194,8 @@ public:
class SwGrfExtPage final : public SfxTabPage
{
- OUString aFilterName;
- OUString aGrfName, aNewGrfName;
+ OUString m_aFilterName;
+ OUString m_aGrfName, m_aNewGrfName;
std::unique_ptr<::sfx2::FileDialogHelper> m_xGrfDlg;
@@ -303,14 +303,14 @@ class SwFrameAddPage final : public SfxTabPage
DECL_LINK(EditModifyHdl, weld::Entry&, void);
DECL_LINK(ChainModifyHdl, weld::ComboBox&, void);
- static const WhichRangesContainer aAddPgRg;
+ static const WhichRangesContainer s_aAddPgRg;
public:
SwFrameAddPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet &rSet);
virtual ~SwFrameAddPage() override;
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet *rSet);
- static WhichRangesContainer GetRanges() { return aAddPgRg; }
+ static WhichRangesContainer GetRanges() { return s_aAddPgRg; }
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
