sw/source/ui/dialog/uiregionsw.cxx | 4 +-
sw/source/ui/envelp/labfmt.cxx | 34 +++++++++++------------
sw/source/ui/envelp/labfmt.hxx | 4 +-
sw/source/ui/table/instable.cxx | 42 ++++++++++++++---------------
sw/source/ui/utlui/swrenamexnameddlg.cxx | 16 +++++------
sw/source/uibase/inc/instable.hxx | 8 ++---
sw/source/uibase/inc/regionsw.hxx | 2 -
sw/source/uibase/inc/swrenamexnameddlg.hxx | 12 ++++----
8 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit f7c88bacd214394fff3826b6ab759285f3411f56
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Sep 26 08:13:09 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 26 09:10:05 2022 +0200
sw: prefix members of SwInsTableDlg, SwRenameXNamedDlg, SwSaveLabelDlg ...
... and SwSectionPropertyTabDialog
See tdf#94879 for motivation.
Change-Id: Id622c7880e978e1631d235a8fe04cb2976bbcd2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140583
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index c71f64383de4..4e775594745b 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1998,7 +1998,7 @@ SwSectionPropertyTabDialog::SwSectionPropertyTabDialog(
weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh)
: SfxTabDialogController(pParent,
"modules/swriter/ui/formatsectiondialog.ui",
"FormatSectionDialog", &rSet)
- , rWrtSh(rSh)
+ , m_rWrtSh(rSh)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
AddTabPage("columns", SwColumnPage::Create, nullptr);
@@ -2035,7 +2035,7 @@ void SwSectionPropertyTabDialog::PageCreated(const
OString& rId, SfxTabPage &rPa
static_cast<SwColumnPage&>(rPage).SetInSection(true);
}
else if (rId == "indents")
- static_cast<SwSectionIndentTabPage&>(rPage).SetWrtShell(rWrtSh);
+ static_cast<SwSectionIndentTabPage&>(rPage).SetWrtShell(m_rWrtSh);
}
SwSectionIndentTabPage::SwSectionIndentTabPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet &rAttrSet)
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 7b7b0b33a90f..3f723ca2285d 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -516,9 +516,9 @@ IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl, weld::Button&,
void)
SwSaveLabelDlg::SwSaveLabelDlg(SwLabDlg* pParent, SwLabRec& rRec)
: GenericDialogController(pParent->getDialog(),
"modules/swriter/ui/savelabeldialog.ui", "SaveLabelDialog")
- , bSuccess(false)
+ , m_bSuccess(false)
, m_pLabDialog(pParent)
- , rLabRec(rRec)
+ , m_rLabRec(rRec)
, m_xMakeCB(m_xBuilder->weld_combo_box("brand"))
, m_xTypeED(m_xBuilder->weld_entry("type"))
, m_xOKPB(m_xBuilder->weld_button("ok"))
@@ -565,9 +565,9 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl, weld::Button&, void)
if (RET_YES != xQuery->run())
return;
}
- rLabRec.m_aType = sType;
- rCfg.SaveLabel(sMake, sType, rLabRec);
- bSuccess = true;
+ m_rLabRec.m_aType = sType;
+ rCfg.SaveLabel(sMake, sType, m_rLabRec);
+ m_bSuccess = true;
m_xDialog->response(RET_OK);
}
@@ -588,22 +588,22 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyEntryHdl,
weld::Entry&, void)
bool SwSaveLabelDlg::GetLabel(SwLabItem& rItem)
{
- if(bSuccess)
+ if(m_bSuccess)
{
rItem.m_aMake = m_xMakeCB->get_active_text();
rItem.m_aType = m_xTypeED->get_text();
- rItem.m_lHDist = rLabRec.m_nHDist;
- rItem.m_lVDist = rLabRec.m_nVDist;
- rItem.m_lWidth = rLabRec.m_nWidth;
- rItem.m_lHeight = rLabRec.m_nHeight;
- rItem.m_lLeft = rLabRec.m_nLeft;
- rItem.m_lUpper = rLabRec.m_nUpper;
- rItem.m_nCols = rLabRec.m_nCols;
- rItem.m_nRows = rLabRec.m_nRows;
- rItem.m_lPWidth = rLabRec.m_nPWidth;
- rItem.m_lPHeight = rLabRec.m_nPHeight;
+ rItem.m_lHDist = m_rLabRec.m_nHDist;
+ rItem.m_lVDist = m_rLabRec.m_nVDist;
+ rItem.m_lWidth = m_rLabRec.m_nWidth;
+ rItem.m_lHeight = m_rLabRec.m_nHeight;
+ rItem.m_lLeft = m_rLabRec.m_nLeft;
+ rItem.m_lUpper = m_rLabRec.m_nUpper;
+ rItem.m_nCols = m_rLabRec.m_nCols;
+ rItem.m_nRows = m_rLabRec.m_nRows;
+ rItem.m_lPWidth = m_rLabRec.m_nPWidth;
+ rItem.m_lPHeight = m_rLabRec.m_nPHeight;
}
- return bSuccess;
+ return m_bSuccess;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 032917948640..b6a7f491505a 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -112,9 +112,9 @@ public:
class SwSaveLabelDlg : public weld::GenericDialogController
{
- bool bSuccess;
+ bool m_bSuccess;
SwLabDlg* m_pLabDialog;
- SwLabRec& rLabRec;
+ SwLabRec& m_rLabRec;
std::unique_ptr<weld::ComboBox> m_xMakeCB;
std::unique_ptr<weld::Entry> m_xTypeED;
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 554e4f2611ee..e10279add315 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -61,8 +61,8 @@ IMPL_LINK(SwInsTableDlg, TextFilterHdl, OUString&, rTest,
bool)
SwInsTableDlg::SwInsTableDlg(SwView& rView)
: SfxDialogController(rView.GetFrameWeld(),
"modules/swriter/ui/inserttable.ui", "InsertTableDialog")
, m_aTextFilter(" .<>")
- , pShell(&rView.GetWrtShell())
- , nEnteredValRepeatHeaderNF(-1)
+ , m_pShell(&rView.GetWrtShell())
+ , m_nEnteredValRepeatHeaderNF(-1)
, m_xNameEdit(m_xBuilder->weld_entry("nameedit"))
, m_xWarning(m_xBuilder->weld_label("lbwarning"))
, m_xColSpinButton(m_xBuilder->weld_spin_button("colspin"))
@@ -86,7 +86,7 @@ SwInsTableDlg::SwInsTableDlg(SwView& rView)
m_xWndPreview->set_size_request(nWidth, nHeight);
m_xNameEdit->connect_insert_text(LINK(this, SwInsTableDlg, TextFilterHdl));
- m_xNameEdit->set_text(pShell->GetUniqueTableName());
+ m_xNameEdit->set_text(m_pShell->GetUniqueTableName());
m_xNameEdit->connect_changed(LINK(this, SwInsTableDlg, ModifyName));
m_xRowSpinButton->connect_changed(LINK(this, SwInsTableDlg, ModifyRowCol));
m_xColSpinButton->connect_changed(LINK(this, SwInsTableDlg, ModifyRowCol));
@@ -125,7 +125,7 @@ SwInsTableDlg::SwInsTableDlg(SwView& rView)
void SwInsTableDlg::InitAutoTableFormat()
{
- m_aWndPreview.DetectRTL(pShell);
+ m_aWndPreview.DetectRTL(m_pShell);
m_xLbFormat->connect_changed(LINK(this, SwInsTableDlg, SelFormatHdl));
@@ -142,15 +142,15 @@ void SwInsTableDlg::InitAutoTableFormat()
SwTableAutoFormat const& rFormat = (*m_xTableTable)[ i ];
m_xLbFormat->append_text(rFormat.GetName());
if (m_xTAutoFormat && rFormat.GetName() == m_xTAutoFormat->GetName())
- lbIndex = i;
+ m_lbIndex = i;
}
// Change this min variable if you add autotable manually.
minTableIndexInLb = 1;
maxTableIndexInLb = minTableIndexInLb +
static_cast<sal_uInt8>(m_xTableTable->size());
- lbIndex = 0;
- m_xLbFormat->select( lbIndex );
- tbIndex = lbIndexToTableIndex(lbIndex);
+ m_lbIndex = 0;
+ m_xLbFormat->select( m_lbIndex );
+ m_tbIndex = lbIndexToTableIndex(m_lbIndex);
SelFormatHdl( *m_xLbFormat );
}
@@ -180,13 +180,13 @@ static void lcl_SetProperties( SwTableAutoFormat*
pTableAutoFormat, bool bVal )
IMPL_LINK_NOARG(SwInsTableDlg, SelFormatHdl, weld::TreeView&, void)
{
// Get index of selected item from the listbox
- lbIndex = static_cast<sal_uInt8>(m_xLbFormat->get_selected_index());
- tbIndex = lbIndexToTableIndex( lbIndex );
+ m_lbIndex = static_cast<sal_uInt8>(m_xLbFormat->get_selected_index());
+ m_tbIndex = lbIndexToTableIndex( m_lbIndex );
// To understand this index mapping, look InitAutoTableFormat function to
// see how listbox item is implemented.
- if( tbIndex < 255 )
- m_aWndPreview.NotifyChange( (*m_xTableTable)[tbIndex] );
+ if( m_tbIndex < 255 )
+ m_aWndPreview.NotifyChange( (*m_xTableTable)[m_tbIndex] );
else
{
SwTableAutoFormat aTmp( SwViewShell::GetShellRes()->aStrNone );
@@ -198,15 +198,15 @@ IMPL_LINK_NOARG(SwInsTableDlg, SelFormatHdl,
weld::TreeView&, void)
IMPL_LINK_NOARG(SwInsTableDlg, OKHdl, weld::Button&, void)
{
- if( tbIndex < 255 )
- pShell->SetTableStyle((*m_xTableTable)[tbIndex]);
+ if( m_tbIndex < 255 )
+ m_pShell->SetTableStyle((*m_xTableTable)[m_tbIndex]);
- if( tbIndex < 255 )
+ if( m_tbIndex < 255 )
{
if( m_xTAutoFormat )
- *m_xTAutoFormat = (*m_xTableTable)[ tbIndex ];
+ *m_xTAutoFormat = (*m_xTableTable)[ m_tbIndex ];
else
- m_xTAutoFormat.reset(new SwTableAutoFormat( (*m_xTableTable)[
tbIndex ] ));
+ m_xTAutoFormat.reset(new SwTableAutoFormat( (*m_xTableTable)[
m_tbIndex ] ));
}
else
{
@@ -220,7 +220,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, OKHdl, weld::Button&, void)
IMPL_LINK( SwInsTableDlg, ModifyName, weld::Entry&, rEdit, void )
{
OUString sTableName = rEdit.get_text();
- m_xInsertBtn->set_sensitive(pShell->GetTableStyle(sTableName) == nullptr);
+ m_xInsertBtn->set_sensitive(m_pShell->GetTableStyle(sTableName) ==
nullptr);
}
// We use weld::Entry's "changed" notification here, not weld::SpinButton's
"value_changed", because
@@ -271,8 +271,8 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, weld::Entry&,
rEdit, void )
if( nActVal > nMax )
m_xRepeatHeaderNF->set_value( nMax );
- else if( nActVal < nEnteredValRepeatHeaderNF )
- m_xRepeatHeaderNF->set_value(std::min(nEnteredValRepeatHeaderNF,
nMax));
+ else if( nActVal < m_nEnteredValRepeatHeaderNF )
+ m_xRepeatHeaderNF->set_value(std::min(m_nEnteredValRepeatHeaderNF,
nMax));
}
IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, weld::Toggleable&, void)
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(SwInsTableDlg, RepeatHeaderCheckBoxHdl,
weld::Toggleable&, void)
IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, weld::SpinButton&,
void)
{
- nEnteredValRepeatHeaderNF = m_xRepeatHeaderNF->get_value();
+ m_nEnteredValRepeatHeaderNF = m_xRepeatHeaderNF->get_value();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx
b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index bbba12a203a8..4bcf29d3c3aa 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -27,17 +27,17 @@ SwRenameXNamedDlg::SwRenameXNamedDlg(weld::Widget* pParent,
uno::Reference< container::XNamed > & xN,
uno::Reference< container::XNameAccess > & xNA )
: GenericDialogController(pParent,
"modules/swriter/ui/renameobjectdialog.ui", "RenameObjectDialog")
- , xNamed(xN)
- , xNameAccess(xNA)
+ , m_xNamed(xN)
+ , m_xNameAccess(xNA)
, m_xNewNameED(m_xBuilder->weld_entry("entry"))
, m_xOk(m_xBuilder->weld_button("ok"))
{
m_xNewNameED->connect_insert_text(LINK(this, SwRenameXNamedDlg,
TextFilterHdl));
OUString sTmp(m_xDialog->get_title());
- m_xNewNameED->set_text(xNamed->getName());
+ m_xNewNameED->set_text(m_xNamed->getName());
m_xNewNameED->select_region(0, -1);
- sTmp += xNamed->getName();
+ sTmp += m_xNamed->getName();
m_xDialog->set_title(sTmp);
m_xOk->connect_clicked(LINK(this, SwRenameXNamedDlg, OkHdl));
@@ -55,7 +55,7 @@ IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl, weld::Button&, void)
{
try
{
- xNamed->setName(m_xNewNameED->get_text());
+ m_xNamed->setName(m_xNewNameED->get_text());
}
catch (const uno::RuntimeException&)
{
@@ -69,9 +69,9 @@ IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, weld::Entry&, rEdit,
void)
OUString sTmp(rEdit.get_text());
m_xOk->set_sensitive(!sTmp.isEmpty()
- && !xNameAccess->hasByName(sTmp)
- && (!xSecondAccess.is() || !xSecondAccess->hasByName(sTmp))
- && (!xThirdAccess.is() || !xThirdAccess->hasByName(sTmp))
+ && !m_xNameAccess->hasByName(sTmp)
+ && (!m_xSecondAccess.is() ||
!m_xSecondAccess->hasByName(sTmp))
+ && (!m_xThirdAccess.is() || !m_xThirdAccess->hasByName(sTmp))
);
}
diff --git a/sw/source/uibase/inc/instable.hxx
b/sw/source/uibase/inc/instable.hxx
index cc3fd0204ccb..be20b64dafd5 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -36,15 +36,15 @@ class SwInsTableDlg final : public SfxDialogController
{
TextFilter m_aTextFilter;
- SwWrtShell* pShell;
+ SwWrtShell* m_pShell;
std::unique_ptr<SwTableAutoFormatTable> m_xTableTable;
std::unique_ptr<SwTableAutoFormat> m_xTAutoFormat;
- sal_uInt8 lbIndex;
- sal_uInt8 tbIndex;
+ sal_uInt8 m_lbIndex;
+ sal_uInt8 m_tbIndex;
sal_uInt8 minTableIndexInLb;
sal_uInt8 maxTableIndexInLb;
- sal_Int64 nEnteredValRepeatHeaderNF;
+ sal_Int64 m_nEnteredValRepeatHeaderNF;
AutoFormatPreview m_aWndPreview;
diff --git a/sw/source/uibase/inc/regionsw.hxx
b/sw/source/uibase/inc/regionsw.hxx
index 67ab70616959..8cd22491cc3a 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -242,7 +242,7 @@ public:
class SwSectionPropertyTabDialog final : public SfxTabDialogController
{
- SwWrtShell& rWrtSh;
+ SwWrtShell& m_rWrtSh;
virtual void PageCreated(const OString& rId, SfxTabPage &rPage)
override;
public:
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx
b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index bb8333d3fb7e..4575df5d414c 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -25,10 +25,10 @@
class SwRenameXNamedDlg final : public weld::GenericDialogController
{
- css::uno::Reference< css::container::XNamed > & xNamed;
- css::uno::Reference< css::container::XNameAccess > & xNameAccess;
- css::uno::Reference< css::container::XNameAccess > xSecondAccess;
- css::uno::Reference< css::container::XNameAccess > xThirdAccess;
+ css::uno::Reference< css::container::XNamed > & m_xNamed;
+ css::uno::Reference< css::container::XNameAccess > & m_xNameAccess;
+ css::uno::Reference< css::container::XNameAccess > m_xSecondAccess;
+ css::uno::Reference< css::container::XNameAccess > m_xThirdAccess;
TextFilter m_aTextFilter;
@@ -53,8 +53,8 @@ public:
css::uno::Reference< css::container::XNameAccess > const & xSecond,
css::uno::Reference< css::container::XNameAccess > const & xThird )
{
- xSecondAccess = xSecond;
- xThirdAccess = xThird;
+ m_xSecondAccess = xSecond;
+ m_xThirdAccess = xThird;
}
};
