sw/source/uibase/app/docstyle.cxx | 20 ++++++++++----------
sw/source/uibase/app/swdll.cxx | 8 ++++----
sw/source/uibase/app/swdllimpl.hxx | 2 +-
sw/source/uibase/fldui/fldwrap.cxx | 10 +++++-----
sw/source/uibase/inc/fldwrap.hxx | 2 +-
sw/source/uibase/inc/redlndlg.hxx | 2 +-
sw/source/uibase/misc/redlndlg.cxx | 6 +++---
7 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 81a1691cfb1290dc7ccc274cf3abc8ea91c73d55
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 11 08:26:38 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 11 09:33:55 2021 +0200
sw: prefix members of SwDLL, SwFieldDlgWrapper, SwImplShellAction and ...
... SwModelessRedlineAcceptDlg
See tdf#94879 for motivation.
Change-Id: I06299afbbba2a52f08526ef9e7bb9c5892c7a7eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123361
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index eafb1f159b46..398f8775ba47 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -80,8 +80,8 @@ namespace {
class SwImplShellAction
{
- SwWrtShell* pSh;
- std::unique_ptr<CurrShell> pCurrSh;
+ SwWrtShell* m_pSh;
+ std::unique_ptr<CurrShell> m_pCurrSh;
public:
explicit SwImplShellAction( SwDoc& rDoc );
~SwImplShellAction() COVERITY_NOEXCEPT_FALSE;
@@ -94,23 +94,23 @@ public:
SwImplShellAction::SwImplShellAction( SwDoc& rDoc )
{
if( rDoc.GetDocShell() )
- pSh = rDoc.GetDocShell()->GetWrtShell();
+ m_pSh = rDoc.GetDocShell()->GetWrtShell();
else
- pSh = nullptr;
+ m_pSh = nullptr;
- if( pSh )
+ if( m_pSh )
{
- pCurrSh.reset( new CurrShell( pSh ) );
- pSh->StartAllAction();
+ m_pCurrSh.reset( new CurrShell( m_pSh ) );
+ m_pSh->StartAllAction();
}
}
SwImplShellAction::~SwImplShellAction() COVERITY_NOEXCEPT_FALSE
{
- if( pCurrSh )
+ if( m_pCurrSh )
{
- pSh->EndAllAction();
- pCurrSh.reset();
+ m_pSh->EndAllAction();
+ m_pCurrSh.reset();
}
}
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 090480bc51da..ad9a3bf3c487 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -118,7 +118,7 @@ SwDLL::SwDLL()
SAL_INFO( "sw.ui", "Init Core/UI/Filter" );
// Initialisation of Statics
::InitCore();
- filters_.reset(new sw::Filters);
+ m_pFilters.reset(new sw::Filters);
::InitUI();
pModule->InitAttrPool();
@@ -155,7 +155,7 @@ SwDLL::~SwDLL() COVERITY_NOEXCEPT_FALSE
SW_MOD()->RemoveAttrPool();
::FinitUI();
- filters_.reset();
+ m_pFilters.reset();
::FinitCore();
// sign out object-Factory
SdrObjFactory::RemoveMakeObjectHdl(LINK(&aSwObjectFactory,
SwObjectFactory, MakeObject ));
@@ -163,8 +163,8 @@ SwDLL::~SwDLL() COVERITY_NOEXCEPT_FALSE
sw::Filters & SwDLL::getFilters()
{
- assert(filters_);
- return *filters_;
+ assert(m_pFilters);
+ return *m_pFilters;
}
#ifndef DISABLE_DYNLOADING
diff --git a/sw/source/uibase/app/swdllimpl.hxx
b/sw/source/uibase/app/swdllimpl.hxx
index bee7110e0e1a..0aea89bfa75b 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -39,7 +39,7 @@ private:
SwDLL(SwDLL const&) = delete;
SwDLL& operator=(SwDLL const&) = delete;
- std::unique_ptr<sw::Filters> filters_;
+ std::unique_ptr<sw::Filters> m_pFilters;
SvxAutoCorrCfg* m_pAutoCorrCfg;
};
diff --git a/sw/source/uibase/fldui/fldwrap.cxx
b/sw/source/uibase/fldui/fldwrap.cxx
index 6400d0a1b2a5..7ee3078a23fa 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -70,9 +70,9 @@ SwFieldDlgWrapper::SwFieldDlgWrapper( vcl::Window* _pParent,
sal_uInt16 nId,
: SwChildWinWrapper( _pParent, nId )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- pDlgInterface = pFact->CreateSwFieldDlg(pB, this,
_pParent->GetFrameWeld());
- SetController(pDlgInterface->GetController());
- pDlgInterface->StartExecuteAsync(nullptr);
+ m_pDlgInterface = pFact->CreateSwFieldDlg(pB, this,
_pParent->GetFrameWeld());
+ SetController(m_pDlgInterface->GetController());
+ m_pDlgInterface->StartExecuteAsync(nullptr);
}
// newly initialise dialog after Doc switch
@@ -81,7 +81,7 @@ bool SwFieldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
bool bRet = SwChildWinWrapper::ReInitDlg(pDocSh);
if (bRet) // update immediately, Doc switch
{
- pDlgInterface->ReInitDlg();
+ m_pDlgInterface->ReInitDlg();
}
return bRet;
@@ -89,7 +89,7 @@ bool SwFieldDlgWrapper::ReInitDlg(SwDocShell *pDocSh)
void SwFieldDlgWrapper::ShowReferencePage()
{
- pDlgInterface->ShowReferencePage();
+ m_pDlgInterface->ShowReferencePage();
}
SFX_IMPL_CHILDWINDOW(SwFieldDataOnlyDlgWrapper, FN_INSERT_FIELD_DATA_ONLY)
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 620c95c6dad6..b696d306113e 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -28,7 +28,7 @@ class AbstractSwFieldDlg;
class SwFieldDlgWrapper final : public SwChildWinWrapper
{
- ScopedVclPtr<AbstractSwFieldDlg> pDlgInterface;
+ ScopedVclPtr<AbstractSwFieldDlg> m_pDlgInterface;
public:
SwFieldDlgWrapper(vcl::Window* pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo);
diff --git a/sw/source/uibase/inc/redlndlg.hxx
b/sw/source/uibase/inc/redlndlg.hxx
index 0e38dd83764e..d488deea7fab 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -126,7 +126,7 @@ class SwModelessRedlineAcceptDlg final : public
SfxModelessDialogController
{
std::unique_ptr<weld::Container> m_xContentArea;
std::unique_ptr<SwRedlineAcceptDlg> m_xImplDlg;
- SwChildWinWrapper* pChildWin;
+ SwChildWinWrapper* m_pChildWin;
public:
SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, weld::Window
*pParent);
diff --git a/sw/source/uibase/misc/redlndlg.cxx
b/sw/source/uibase/misc/redlndlg.cxx
index caa4e5351a0a..5a53a7472fe0 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -82,7 +82,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg(
: SfxModelessDialogController(_pBindings, pChild, pParent,
"svx/ui/acceptrejectchangesdialog.ui", "AcceptRejectChangesDialog")
, m_xContentArea(m_xDialog->weld_content_area())
- , pChildWin(pChild)
+ , m_pChildWin(pChild)
{
m_xImplDlg.reset(new SwRedlineAcceptDlg(m_xDialog, m_xBuilder.get(),
m_xContentArea.get()));
}
@@ -95,12 +95,12 @@ void SwModelessRedlineAcceptDlg::Activate()
SwDocShell *pDocSh = pView->GetDocShell();
- if (pChildWin->GetOldDocShell() != pDocSh)
+ if (m_pChildWin->GetOldDocShell() != pDocSh)
{ // doc-switch
SwWait aWait( *pDocSh, false );
SwWrtShell* pSh = pView->GetWrtShellPtr();
- pChildWin->SetOldDocShell(pDocSh); // avoid recursion (using
modified-Hdl)
+ m_pChildWin->SetOldDocShell(pDocSh); // avoid recursion (using
modified-Hdl)
bool bMod = pSh->IsModified();
SfxBoolItem aShow(FN_REDLINE_SHOW, true);
