sw/source/ui/fldui/flddinf.cxx | 22 +++++++++++-----------
sw/source/ui/fldui/flddinf.hxx | 6 +++---
sw/source/ui/fldui/flddok.cxx | 12 ++++++------
sw/source/ui/fldui/flddok.hxx | 4 ++--
sw/source/ui/fldui/fldfunc.cxx | 14 +++++++-------
sw/source/ui/fldui/fldfunc.hxx | 4 ++--
sw/source/ui/misc/translatelangselect.cxx | 4 ++--
sw/source/uibase/inc/translatelangselect.hxx | 2 +-
8 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit cd5acf308552ee878215e71251eb57dc5108b92a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 24 08:23:30 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 24 09:05:37 2022 +0200
sw: prefix members of SwFieldDokInfPage, SwFieldDokPage, SwFieldFuncPage ...
... and SwTranslateLangSelectDlg
See tdf#94879 for motivation.
Change-Id: I8a01e86594cc019815f5fa1e9b13c101a4cda6c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141714
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 45f97bdaa1a7..3fa401211b1f 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -52,8 +52,8 @@ void FillFieldSelect(weld::TreeView& rListBox)
SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet *const pCoreSet)
: SwFieldPage(pPage, pController, "modules/swriter/ui/flddocinfopage.ui",
"FieldDocInfoPage", pCoreSet)
- , nOldSel(0)
- , nOldFormat(0)
+ , m_nOldSel(0)
+ , m_nOldFormat(0)
, m_xTypeList(m_xBuilder->weld_tree_view("type-list"))
, m_xTypeTree(m_xBuilder->weld_tree_view("type-tree"))
// tdf#104278 have two tree views, one with expander and one without, the
one with is only used
@@ -84,7 +84,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage,
weld::DialogControl
? pCoreSet->GetItem(FN_FIELD_DIALOG_DOC_PROPS, false)
: nullptr;
if ( pItem )
- pItem->GetValue() >>= xCustomPropertySet;
+ pItem->GetValue() >>= m_xCustomPropertySet;
// uitests
m_pTypeView->set_buildable_name("type-docinf");
@@ -101,9 +101,9 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
Init(); // general initialisation
uno::Sequence<beans::Property> aCustomProperties;
- if (xCustomPropertySet.is())
+ if (m_xCustomPropertySet.is())
{
- uno::Reference<beans::XPropertySetInfo> xSetInfo =
xCustomPropertySet->getPropertySetInfo();
+ uno::Reference<beans::XPropertySetInfo> xSetInfo =
m_xCustomPropertySet->getPropertySetInfo();
aCustomProperties = xSetInfo->getProperties();
}
@@ -171,7 +171,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
const OUString sId(OUString::number(i));
if (DI_CUSTOM == i)
{
- if(xCustomPropertySet.is() )
+ if(m_xCustomPropertySet.is() )
{
if (aCustomProperties.hasElements())
{
@@ -241,8 +241,8 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
if (IsFieldEdit())
{
- nOldSel = m_xSelectionLB->get_selected_index();
- nOldFormat = GetCurField()->GetFormat();
+ m_nOldSel = m_xSelectionLB->get_selected_index();
+ m_nOldFormat = GetCurField()->GetFormat();
m_xFixedCB->save_state();
}
}
@@ -280,7 +280,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl,
weld::TreeView&, void)
const OUString sName = m_pTypeView->get_text(*m_xSelEntry);
try
{
- uno::Any aVal = xCustomPropertySet->getPropertyValue(
sName );
+ uno::Any aVal =
m_xCustomPropertySet->getPropertyValue( sName );
const uno::Type& rValueType = aVal.getValueType();
if( rValueType ==
::cppu::UnoType<util::DateTime>::get())
{
@@ -479,8 +479,8 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
if(nPos != -1)
nFormat = m_xFormatLB->GetFormat();
- if (!IsFieldEdit() || nOldSel != m_xSelectionLB->get_selected_index() ||
- nOldFormat != nFormat || m_xFixedCB->get_state_changed_from_saved()
+ if (!IsFieldEdit() || m_nOldSel != m_xSelectionLB->get_selected_index() ||
+ m_nOldFormat != nFormat || m_xFixedCB->get_state_changed_from_saved()
|| (DI_CUSTOM == nSubType && aName != m_sOldCustomFieldName ))
{
InsertField(SwFieldTypesEnum::DocumentInfo, nSubType, aName,
OUString(), nFormat,
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 391f5a346288..f37de0a1939a 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -28,10 +28,10 @@ namespace com::sun::star::beans { class XPropertySet; }
class SwFieldDokInfPage : public SwFieldPage
{
std::unique_ptr<weld::TreeIter> m_xSelEntry;
- css::uno::Reference < css::beans::XPropertySet > xCustomPropertySet;
+ css::uno::Reference < css::beans::XPropertySet > m_xCustomPropertySet;
- sal_Int32 nOldSel;
- sal_uLong nOldFormat;
+ sal_Int32 m_nOldSel;
+ sal_uLong m_nOldFormat;
OUString m_sOldCustomFieldName;
std::unique_ptr<weld::TreeView> m_xTypeList;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 4e65a7c3fb26..e29bd09d828a 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -34,8 +34,8 @@
SwFieldDokPage::SwFieldDokPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet *const pCoreSet)
: SwFieldPage(pPage, pController, "modules/swriter/ui/flddocumentpage.ui",
"FieldDocumentPage", pCoreSet)
- , nOldSel(0)
- , nOldFormat(0)
+ , m_nOldSel(0)
+ , m_nOldFormat(0)
, m_xTypeLB(m_xBuilder->weld_tree_view("type"))
, m_xSelection(m_xBuilder->weld_widget("selectframe"))
, m_xSelectionLB(m_xBuilder->weld_tree_view("select"))
@@ -174,8 +174,8 @@ void SwFieldDokPage::Reset(const SfxItemSet* )
if (IsFieldEdit())
{
- nOldSel = m_xSelectionLB->get_selected_index();
- nOldFormat = GetCurField()->GetFormat();
+ m_nOldSel = m_xSelectionLB->get_selected_index();
+ m_nOldFormat = GetCurField()->GetFormat();
m_xFixedCB->save_state();
m_xValueED->save_value();
m_xLevelED->save_value();
@@ -606,8 +606,8 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
}
if (!IsFieldEdit() ||
- nOldSel != m_xSelectionLB->get_selected_index() ||
- nOldFormat != nFormat ||
+ m_nOldSel != m_xSelectionLB->get_selected_index() ||
+ m_nOldFormat != nFormat ||
m_xFixedCB->get_state_changed_from_saved() ||
m_xValueED->get_value_changed_from_saved() ||
m_xLevelED->get_value_changed_from_saved() ||
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index ce61dd15e695..a43b7547df0e 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -26,8 +26,8 @@
class SwFieldDokPage : public SwFieldPage
{
- sal_Int32 nOldSel;
- sal_uLong nOldFormat;
+ sal_Int32 m_nOldSel;
+ sal_uLong m_nOldFormat;
std::unique_ptr<weld::TreeView> m_xTypeLB;
std::unique_ptr<weld::Widget> m_xSelection;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 017a4d19c6aa..2ebd15ffa7fc 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -35,8 +35,8 @@ using namespace ::com::sun::star;
SwFieldFuncPage::SwFieldFuncPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet *const pCoreSet)
: SwFieldPage(pPage, pController, "modules/swriter/ui/fldfuncpage.ui",
"FieldFuncPage", pCoreSet)
- , nOldFormat(0)
- , bDropDownLBChanged(false)
+ , m_nOldFormat(0)
+ , m_bDropDownLBChanged(false)
, m_xTypeLB(m_xBuilder->weld_tree_view("type"))
, m_xSelectionLB(m_xBuilder->weld_tree_view("select"))
, m_xFormat(m_xBuilder->weld_widget("formatframe"))
@@ -177,7 +177,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
m_xValueED->save_value();
m_xCond1ED->save_value();
m_xCond2ED->save_value();
- nOldFormat = GetCurField()->GetFormat();
+ m_nOldFormat = GetCurField()->GetFormat();
}
}
@@ -264,7 +264,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, weld::TreeView&,
void)
m_xListItemsLB->select_text(pDrop->GetSelectedItem());
m_xListNameED->set_text(pDrop->GetPar2());
m_xListNameED->save_value();
- bDropDownLBChanged = false;
+ m_bDropDownLBChanged = false;
}
else
{
@@ -449,7 +449,7 @@ void SwFieldFuncPage::ListModifyHdl(const weld::Widget*
pControl)
}
}
}
- bDropDownLBChanged = true;
+ m_bDropDownLBChanged = true;
ListEnableHdl(*m_xListItemED);
}
@@ -566,8 +566,8 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
m_xCond1ED->get_value_changed_from_saved() ||
m_xCond2ED->get_value_changed_from_saved() ||
m_xListNameED->get_value_changed_from_saved() ||
- bDropDownLBChanged ||
- nOldFormat != nFormat)
+ m_bDropDownLBChanged ||
+ m_nOldFormat != nFormat)
{
InsertField( nTypeId, nSubType, aName, aVal, nFormat );
}
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 364a71d8e59e..35142a824315 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -29,8 +29,8 @@ class SwFieldFuncPage : public SwFieldPage
OUString m_sOldValueFT;
OUString m_sOldNameFT;
- sal_uLong nOldFormat;
- bool bDropDownLBChanged;
+ sal_uLong m_nOldFormat;
+ bool m_bDropDownLBChanged;
std::unique_ptr<weld::TreeView> m_xTypeLB;
std::unique_ptr<weld::TreeView> m_xSelectionLB;
diff --git a/sw/source/ui/misc/translatelangselect.cxx
b/sw/source/ui/misc/translatelangselect.cxx
index 7e6d02cf94fb..18a3214bfebd 100644
--- a/sw/source/ui/misc/translatelangselect.cxx
+++ b/sw/source/ui/misc/translatelangselect.cxx
@@ -43,7 +43,7 @@ int SwTranslateLangSelectDlg::selectedLangIdx = -1;
SwTranslateLangSelectDlg::SwTranslateLangSelectDlg(weld::Window* pParent,
SwWrtShell& rSh)
: GenericDialogController(pParent,
"modules/swriter/ui/translationdialog.ui",
"LanguageSelectDialog")
- , rWrtSh(rSh)
+ , m_rWrtSh(rSh)
, m_xLanguageListBox(m_xBuilder->weld_combo_box("combobox1"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
, m_xBtnTranslate(m_xBuilder->weld_button("translate"))
@@ -146,7 +146,7 @@ IMPL_LINK_NOARG(SwTranslateLangSelectDlg,
LangSelectTranslateHdl, weld::Button&,
m_bTranslationStarted = true;
SwTranslateHelper::TranslateAPIConfig aConfig({ aAPIUrl, aAuthKey,
aTargetLang });
- SwTranslateHelper::TranslateDocumentCancellable(rWrtSh, aConfig,
m_bCancelTranslation);
+ SwTranslateHelper::TranslateDocumentCancellable(m_rWrtSh, aConfig,
m_bCancelTranslation);
m_xDialog->response(RET_OK);
}
diff --git a/sw/source/uibase/inc/translatelangselect.hxx
b/sw/source/uibase/inc/translatelangselect.hxx
index 4190aafac442..e8920786ea93 100644
--- a/sw/source/uibase/inc/translatelangselect.hxx
+++ b/sw/source/uibase/inc/translatelangselect.hxx
@@ -52,7 +52,7 @@ public:
std::optional<SwLanguageListItem> GetSelectedLanguage();
private:
- SwWrtShell& rWrtSh;
+ SwWrtShell& m_rWrtSh;
std::unique_ptr<weld::ComboBox> m_xLanguageListBox;
std::unique_ptr<weld::Button> m_xBtnCancel;
std::unique_ptr<weld::Button> m_xBtnTranslate;
