sw/inc/dlelstnr.hxx | 6 +++---
sw/source/uibase/inc/idxmrk.hxx | 2 +-
sw/source/uibase/inc/swcont.hxx | 6 +++---
sw/source/uibase/inc/tmplctrl.hxx | 2 +-
sw/source/uibase/index/idxmrk.cxx | 6 +++---
sw/source/uibase/uno/dlelstnr.cxx | 32 ++++++++++++++++----------------
sw/source/uibase/utlui/tmplctrl.cxx | 4 ++--
7 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit c858a59158ed638642139aeda3a720b6a847ff95
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 15 08:22:20 2021 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 15 11:25:24 2021 +0100
sw: prefix members of SwInsertIdxMarkWrapper, ...
... SwLinguServiceEventListener, SwTemplateControl and SwTypeNumber
See tdf#94879 for motivation.
Change-Id: Ia76bd27b6ae361dbeb03d2cdab5b95bd0033460b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125217
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index f431bbda8821..ca4ef456def4 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -46,9 +46,9 @@ class SwLinguServiceEventListener final :
css::frame::XTerminateListener
>
{
- css::uno::Reference<css::frame::XDesktop2 > xDesktop;
- css::uno::Reference<css::linguistic2::XLinguServiceManager2 >
xLngSvcMgr;
- css::uno::Reference<css::linguistic2::XProofreadingIterator >
xGCIterator;
+ css::uno::Reference<css::frame::XDesktop2 >
m_xDesktop;
+ css::uno::Reference<css::linguistic2::XLinguServiceManager2 >
m_xLngSvcMgr;
+ css::uno::Reference<css::linguistic2::XProofreadingIterator >
m_xGCIterator;
SwLinguServiceEventListener(const SwLinguServiceEventListener &) = delete;
SwLinguServiceEventListener & operator = (const
SwLinguServiceEventListener &) = delete;
diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx
index 5e4e8d973dce..37dfa76c1bc2 100644
--- a/sw/source/uibase/inc/idxmrk.hxx
+++ b/sw/source/uibase/inc/idxmrk.hxx
@@ -27,7 +27,7 @@ class SwWrtShell;
class SwInsertIdxMarkWrapper final : public SfxChildWindow
{
- ScopedVclPtr<AbstractMarkFloatDlg> xAbstDlg;
+ ScopedVclPtr<AbstractMarkFloatDlg> m_xAbstDlg;
public:
SwInsertIdxMarkWrapper(vcl::Window *pParentWindow,
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 19d17ebe6598..751c4549a484 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -61,13 +61,13 @@ enum class RegionMode
//mini rtti
class SwTypeNumber
{
- sal_uInt8 nTypeId;
+ sal_uInt8 m_nTypeId;
public:
- SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){}
+ SwTypeNumber(sal_uInt8 nId) :m_nTypeId(nId){}
virtual ~SwTypeNumber();
- sal_uInt8 GetTypeId() const { return nTypeId;}
+ sal_uInt8 GetTypeId() const { return m_nTypeId;}
};
class SwContent : public SwTypeNumber
diff --git a/sw/source/uibase/inc/tmplctrl.hxx
b/sw/source/uibase/inc/tmplctrl.hxx
index df8ed5170b04..0b60c3a6be22 100644
--- a/sw/source/uibase/inc/tmplctrl.hxx
+++ b/sw/source/uibase/inc/tmplctrl.hxx
@@ -36,7 +36,7 @@ public:
virtual ~SwTemplateControl() override;
private:
- OUString sTemplate;
+ OUString m_sTemplate;
};
#endif
diff --git a/sw/source/uibase/index/idxmrk.cxx
b/sw/source/uibase/index/idxmrk.cxx
index 65ec830c3f0d..142d9fedad1a 100644
--- a/sw/source/uibase/index/idxmrk.cxx
+++ b/sw/source/uibase/index/idxmrk.cxx
@@ -30,8 +30,8 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( vcl::Window
*pParentWindow,
SfxChildWindow(pParentWindow, nId)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- xAbstDlg = pFact->CreateIndexMarkFloatDlg(pBindings, this,
pParentWindow->GetFrameWeld(), pInfo);
- SetController(xAbstDlg->GetController());
+ m_xAbstDlg = pFact->CreateIndexMarkFloatDlg(pBindings, this,
pParentWindow->GetFrameWeld(), pInfo);
+ SetController(m_xAbstDlg->GetController());
}
SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const
@@ -43,7 +43,7 @@ SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const
void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell)
{
- xAbstDlg->ReInitDlg(rWrtShell);
+ m_xAbstDlg->ReInitDlg(rWrtShell);
}
SFX_IMPL_CHILDWINDOW_WITHID(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG)
diff --git a/sw/source/uibase/uno/dlelstnr.cxx
b/sw/source/uibase/uno/dlelstnr.cxx
index 19a0aa34efb2..60b11fc4d8ac 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -47,16 +47,16 @@ SwLinguServiceEventListener::SwLinguServiceEventListener()
Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
try
{
- xDesktop = frame::Desktop::create(xContext);
- xDesktop->addTerminateListener( this );
+ m_xDesktop = frame::Desktop::create(xContext);
+ m_xDesktop->addTerminateListener( this );
- xLngSvcMgr = LinguServiceManager::create(xContext);
- xLngSvcMgr->addLinguServiceManagerListener(
static_cast<XLinguServiceEventListener *>(this) );
+ m_xLngSvcMgr = LinguServiceManager::create(xContext);
+ m_xLngSvcMgr->addLinguServiceManagerListener(
static_cast<XLinguServiceEventListener *>(this) );
if (SvtLinguConfig().HasGrammarChecker())
{
- xGCIterator = sw::proofreadingiterator::get(xContext);
- Reference< XLinguServiceEventBroadcaster > xBC( xGCIterator,
UNO_QUERY );
+ m_xGCIterator = sw::proofreadingiterator::get(xContext);
+ Reference< XLinguServiceEventBroadcaster > xBC( m_xGCIterator,
UNO_QUERY );
if (xBC.is())
xBC->addLinguServiceEventListener(
static_cast<XLinguServiceEventListener *>(this) );
}
@@ -105,10 +105,10 @@ void SAL_CALL SwLinguServiceEventListener::disposing(
{
SolarMutexGuard aGuard;
- if (xLngSvcMgr.is() && rEventObj.Source == xLngSvcMgr)
- xLngSvcMgr = nullptr;
- if (xLngSvcMgr.is() && rEventObj.Source == xGCIterator)
- xGCIterator = nullptr;
+ if (m_xLngSvcMgr.is() && rEventObj.Source == m_xLngSvcMgr)
+ m_xLngSvcMgr = nullptr;
+ if (m_xLngSvcMgr.is() && rEventObj.Source == m_xGCIterator)
+ m_xGCIterator = nullptr;
}
void SAL_CALL SwLinguServiceEventListener::queryTermination(
@@ -121,13 +121,13 @@ void SAL_CALL
SwLinguServiceEventListener::notifyTermination(
{
SolarMutexGuard aGuard;
- if (xDesktop.is() && rEventObj.Source == xDesktop)
+ if (m_xDesktop.is() && rEventObj.Source == m_xDesktop)
{
- if (xLngSvcMgr.is())
- xLngSvcMgr = nullptr;
- if (xGCIterator.is())
- xGCIterator = nullptr;
- xDesktop = nullptr;
+ if (m_xLngSvcMgr.is())
+ m_xLngSvcMgr = nullptr;
+ if (m_xGCIterator.is())
+ m_xGCIterator = nullptr;
+ m_xDesktop = nullptr;
}
}
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx
b/sw/source/uibase/utlui/tmplctrl.cxx
index da9887745f17..bccb4cb58ab2 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -54,8 +54,8 @@ void SwTemplateControl::StateChangedAtStatusBarControl(
const SfxStringItem* pItem = nullptr;
if (SfxItemState::DEFAULT == eState && (pItem = dynamic_cast<const
SfxStringItem*>(pState)))
{
- sTemplate = pItem->GetValue();
- GetStatusBar().SetItemText(GetId(), sTemplate);
+ m_sTemplate = pItem->GetValue();
+ GetStatusBar().SetItemText(GetId(), m_sTemplate);
GetStatusBar().SetQuickHelpText(GetId(), SwResId(STR_TMPLCTRL_HINT));
}
else
