sw/source/uibase/dialog/swwrtshitem.cxx | 4 ++--
sw/source/uibase/fldui/fldwrap.cxx | 12 ++++++------
sw/source/uibase/inc/fldwrap.hxx | 2 +-
sw/source/uibase/inc/swwrtshitem.hxx | 4 ++--
sw/source/uibase/inc/uiitems.hxx | 10 +++++-----
sw/source/uibase/utlui/uiitems.cxx | 14 +++++++-------
6 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 410e294f8decccdfe7eded7e5a6934e7eab1b867
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 4 08:10:55 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 4 08:59:46 2021 +0200
sw: prefix members of SwFieldDataOnlyDlgWrapper, SwPtrItem, ...
... SwUINumRuleItem and SwWrtShellItem
See tdf#94879 for motivation.
Change-Id: I2b360aae78200fcc0a479ec76e895331c6a0e124
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123035
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx
b/sw/source/uibase/dialog/swwrtshitem.cxx
index ad88e205e210..d64f716b1492 100644
--- a/sw/source/uibase/dialog/swwrtshitem.cxx
+++ b/sw/source/uibase/dialog/swwrtshitem.cxx
@@ -21,7 +21,7 @@
#include <globals.hrc>
SwWrtShellItem::SwWrtShellItem( SwWrtShell* pSh )
- : SfxPoolItem( SID_WRT_SHELL ), pWrtSh( pSh )
+ : SfxPoolItem( SID_WRT_SHELL ), m_pWrtSh( pSh )
{
}
@@ -29,7 +29,7 @@ SwWrtShellItem::SwWrtShellItem( SwWrtShell* pSh )
bool SwWrtShellItem::operator==( const SfxPoolItem& rItem) const
{
return SfxPoolItem::operator==(rItem)
- && pWrtSh == static_cast<const SwWrtShellItem&>(rItem).pWrtSh;
+ && m_pWrtSh == static_cast<const SwWrtShellItem&>(rItem).m_pWrtSh;
}
SwWrtShellItem* SwWrtShellItem::Clone( SfxItemPool * /*pPool*/ ) const
diff --git a/sw/source/uibase/fldui/fldwrap.cxx
b/sw/source/uibase/fldui/fldwrap.cxx
index 69e296eb7600..6400d0a1b2a5 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -109,12 +109,12 @@ SwFieldDataOnlyDlgWrapper::SwFieldDataOnlyDlgWrapper(
vcl::Window* _pParent, sal
: SwChildWinWrapper( _pParent, nId )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- pDlgInterface = pFact->CreateSwFieldDlg(pB, this,
_pParent->GetFrameWeld());
+ m_pDlgInterface = pFact->CreateSwFieldDlg(pB, this,
_pParent->GetFrameWeld());
- SetController(pDlgInterface->GetController());
- pDlgInterface->ActivateDatabasePage();
- pDlgInterface->StartExecuteAsync(nullptr);
- pDlgInterface->Initialize( pInfo );
+ SetController(m_pDlgInterface->GetController());
+ m_pDlgInterface->ActivateDatabasePage();
+ m_pDlgInterface->StartExecuteAsync(nullptr);
+ m_pDlgInterface->Initialize( pInfo );
}
// re-init after doc activation
@@ -123,7 +123,7 @@ bool SwFieldDataOnlyDlgWrapper::ReInitDlg(SwDocShell
*pDocSh)
bool bRet = SwChildWinWrapper::ReInitDlg(pDocSh);
if (bRet) // update immediately, Doc switch
{
- pDlgInterface->ReInitDlg();
+ m_pDlgInterface->ReInitDlg();
}
return bRet;
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index a0d0b9d9dfbc..620c95c6dad6 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -42,7 +42,7 @@ public:
// field dialog only showing database page to support mail merge
class SwFieldDataOnlyDlgWrapper final : public SwChildWinWrapper
{
- ScopedVclPtr<AbstractSwFieldDlg> pDlgInterface;
+ ScopedVclPtr<AbstractSwFieldDlg> m_pDlgInterface;
public:
SwFieldDataOnlyDlgWrapper(vcl::Window* pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo);
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx
b/sw/source/uibase/inc/swwrtshitem.hxx
index cae378413ded..ab8f0f769069 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -25,7 +25,7 @@ class SwWrtShell;
class SW_DLLPUBLIC SwWrtShellItem final : public SfxPoolItem
{
- SwWrtShell* pWrtSh;
+ SwWrtShell* m_pWrtSh;
public:
SwWrtShellItem( SwWrtShell* pWrtSh );
@@ -33,7 +33,7 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SwWrtShellItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
- SwWrtShell* GetValue() const { return pWrtSh; }
+ SwWrtShell* GetValue() const { return m_pWrtSh; }
};
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index ad4b9239ac9f..ded71553858f 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -60,7 +60,7 @@ public:
class SW_DLLPUBLIC SwPtrItem final : public SfxPoolItem
{
- void* pMisc;
+ void* m_pMisc;
public:
SwPtrItem( const sal_uInt16 nId, void* pPtr);
@@ -68,12 +68,12 @@ public:
virtual SwPtrItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual bool operator==( const SfxPoolItem& ) const override;
- void* GetValue() const { return pMisc; }
+ void* GetValue() const { return m_pMisc; }
};
class SW_DLLPUBLIC SwUINumRuleItem final : public SfxPoolItem
{
- std::unique_ptr<SwNumRule> pRule;
+ std::unique_ptr<SwNumRule> m_pRule;
public:
SwUINumRuleItem( const SwNumRule& rRule );
@@ -86,8 +86,8 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
- const SwNumRule* GetNumRule() const { return pRule.get(); }
- SwNumRule* GetNumRule() { return pRule.get(); }
+ const SwNumRule* GetNumRule() const { return m_pRule.get(); }
+ SwNumRule* GetNumRule() { return m_pRule.get(); }
};
class SwPaMItem final : public SfxPoolItem
diff --git a/sw/source/uibase/utlui/uiitems.cxx
b/sw/source/uibase/utlui/uiitems.cxx
index 7558bf36ba0e..fc4039d2cbb8 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -191,7 +191,7 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
SwPtrItem::SwPtrItem( const sal_uInt16 nId, void* pPtr ) :
SfxPoolItem( nId ),
- pMisc(pPtr)
+ m_pMisc(pPtr)
{
}
@@ -205,19 +205,19 @@ SwPtrItem* SwPtrItem::Clone( SfxItemPool * /*pPool*/ )
const
bool SwPtrItem::operator==( const SfxPoolItem& rAttr ) const
{
return SfxPoolItem::operator==(rAttr)
- && pMisc == static_cast<const SwPtrItem&>(rAttr).pMisc;
+ && m_pMisc == static_cast<const SwPtrItem&>(rAttr).m_pMisc;
}
// SwUINumRuleItem for the NumTabPages of the FormatNumRule/Styleists
SwUINumRuleItem::SwUINumRuleItem( const SwNumRule& rRul )
- : SfxPoolItem( FN_PARAM_ACT_NUMBER ), pRule( new SwNumRule( rRul ) )
+ : SfxPoolItem( FN_PARAM_ACT_NUMBER ), m_pRule( new SwNumRule( rRul ) )
{
}
SwUINumRuleItem::SwUINumRuleItem( const SwUINumRuleItem& rItem )
: SfxPoolItem( rItem ),
- pRule( new SwNumRule( *rItem.pRule ))
+ m_pRule( new SwNumRule( *rItem.m_pRule ))
{
}
@@ -233,12 +233,12 @@ SwUINumRuleItem* SwUINumRuleItem::Clone( SfxItemPool *
/*pPool*/ ) const
bool SwUINumRuleItem::operator==( const SfxPoolItem& rAttr ) const
{
return SfxPoolItem::operator==(rAttr)
- && *pRule == *static_cast<const SwUINumRuleItem&>(rAttr).pRule;
+ && *m_pRule == *static_cast<const SwUINumRuleItem&>(rAttr).m_pRule;
}
bool SwUINumRuleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
const
{
- uno::Reference< container::XIndexReplace >xRules = new
SwXNumberingRules(*pRule);
+ uno::Reference< container::XIndexReplace >xRules = new
SwXNumberingRules(*m_pRule);
rVal <<= xRules;
return true;
}
@@ -250,7 +250,7 @@ bool SwUINumRuleItem::PutValue( const uno::Any& rVal,
sal_uInt8 /*nMemberId*/ )
auto pSwXRules =
comphelper::getFromUnoTunnel<SwXNumberingRules>(xRulesRef);
if(pSwXRules)
{
- *pRule = *pSwXRules->GetNumRule();
+ *m_pRule = *pSwXRules->GetNumRule();
}
}
return true;
