include/svx/svdundo.hxx | 2 +-
reportdesign/source/core/sdr/UndoActions.cxx | 12 ++++++------
reportdesign/source/ui/misc/RptUndo.cxx | 2 +-
svx/source/form/fmundo.cxx | 8 ++++----
svx/source/svdraw/svdundo.cxx | 24 ++++++++++++------------
5 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 9683305264568d77a1d912f4b0d2e063455feeae
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon May 6 08:19:53 2024 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon May 6 10:00:58 2024 +0200
svx: prefix members of SdrUndoAction
See tdf#94879 for motivation.
Change-Id: Ieca2f1d0a8b781a908e3b4bd7fd7698305248a60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167181
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 80c7ae4560b3..824f36f06efc 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -60,7 +60,7 @@ namespace svx { namespace diagram {
class SVXCORE_DLLPUBLIC SdrUndoAction : public SfxUndoAction
{
protected:
- SdrModel& rMod;
+ SdrModel& m_rMod;
ViewShellId m_nViewShellId;
protected:
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx
b/reportdesign/source/core/sdr/UndoActions.cxx
index 5aaa412cf1ff..e078ffa2c931 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -113,7 +113,7 @@ OUndoContainerAction::~OUndoContainerAction()
if ( !xChild.is() || xChild->getParent().is() )
return;
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
rEnv.RemoveElement( m_xOwnElement );
// -> dispose it
@@ -141,7 +141,7 @@ void OUndoContainerAction::implReInsert( )
void OUndoContainerAction::implReRemove( )
{
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
try
{
OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
@@ -234,7 +234,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(
void OUndoGroupSectionAction::implReInsert( )
{
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
try
{
OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
@@ -251,7 +251,7 @@ void OUndoGroupSectionAction::implReInsert( )
void OUndoGroupSectionAction::implReRemove( )
{
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
try
{
OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
@@ -278,7 +278,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(
void OUndoReportSectionAction::implReInsert( )
{
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
try
{
OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
@@ -301,7 +301,7 @@ void OUndoReportSectionAction::implReInsert( )
void OUndoReportSectionAction::implReRemove( )
{
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
try
{
OXUndoEnvironment::OUndoEnvLock aLock(rEnv);
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx
b/reportdesign/source/ui/misc/RptUndo.cxx
index 7a835237722a..bff3c4518b1a 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -125,7 +125,7 @@ OSectionUndo::~OSectionUndo()
if ( m_bInserted )
return;
- OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod
).GetUndoEnv();
+ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( m_rMod
).GetUndoEnv();
for (uno::Reference<drawing::XShape>& xShape : m_aControls)
{
rEnv.RemoveElement(xShape);
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 9bbe99a81d6e..956d4a06e43e 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -964,7 +964,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel&
rNewMod, const PropertyC
void FmUndoPropertyAction::Undo()
{
- FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv();
+ FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(m_rMod).GetUndoEnv();
if (!xObj.is() || rEnv.IsLocked())
return;
@@ -984,7 +984,7 @@ void FmUndoPropertyAction::Undo()
void FmUndoPropertyAction::Redo()
{
- FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv();
+ FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(m_rMod).GetUndoEnv();
if (!xObj.is() || rEnv.IsLocked())
return;
@@ -1125,7 +1125,7 @@ void FmUndoContainerAction::implReRemove( )
void FmUndoContainerAction::Undo()
{
- FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod
).GetUndoEnv();
+ FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( m_rMod
).GetUndoEnv();
if ( !(m_xContainer.is() && !rEnv.IsLocked() && m_xElement.is()) )
return;
@@ -1154,7 +1154,7 @@ void FmUndoContainerAction::Undo()
void FmUndoContainerAction::Redo()
{
- FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod
).GetUndoEnv();
+ FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( m_rMod
).GetUndoEnv();
if ( !(m_xContainer.is() && !rEnv.IsLocked() && m_xElement.is()) )
return;
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index e9a4023d0de4..18b248ba5960 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -60,7 +60,7 @@ static void ImplUnmarkObject( SdrObject* pObj )
}
SdrUndoAction::SdrUndoAction(SdrModel& rNewMod)
- : rMod(rNewMod), m_nViewShellId(-1)
+ : m_rMod(rNewMod), m_nViewShellId(-1)
{
if (SfxViewShell* pViewShell = SfxViewShell::Current())
m_nViewShellId = pViewShell->GetViewShellId();
@@ -952,7 +952,7 @@ SdrUndoSort::SdrUndoSort(const SdrPage & rPage,
void SdrUndoSort::Do(::std::vector<sal_Int32> & rSortOrder)
{
- SdrPage & rPage(*rMod.GetPage(m_nPage));
+ SdrPage & rPage(*m_rMod.GetPage(m_nPage));
if (rPage.GetObjCount() != rSortOrder.size())
{
// can probably happen with sw's cursed SdrVirtObj mess - no good
solution for that
@@ -1314,11 +1314,11 @@ void SdrUndoPage::ImpInsertPage(sal_uInt16 nNum)
{
if (mxPage->IsMasterPage())
{
- rMod.InsertMasterPage(mxPage.get(), nNum);
+ m_rMod.InsertMasterPage(mxPage.get(), nNum);
}
else
{
- rMod.InsertPage(mxPage.get(), nNum);
+ m_rMod.InsertPage(mxPage.get(), nNum);
}
}
}
@@ -1332,11 +1332,11 @@ void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum)
rtl::Reference<SdrPage> pChkPg;
if (mxPage->IsMasterPage())
{
- pChkPg = rMod.RemoveMasterPage(nNum);
+ pChkPg = m_rMod.RemoveMasterPage(nNum);
}
else
{
- pChkPg = rMod.RemovePage(nNum);
+ pChkPg = m_rMod.RemovePage(nNum);
}
DBG_ASSERT(pChkPg==mxPage,"SdrUndoPage::ImpRemovePage():
RemovePage!=mxPage");
}
@@ -1348,11 +1348,11 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum,
sal_uInt16 nNewNum)
{
if (mxPage->IsMasterPage())
{
- rMod.MoveMasterPage(nOldNum,nNewNum);
+ m_rMod.MoveMasterPage(nOldNum,nNewNum);
}
else
{
- rMod.MovePage(nOldNum,nNewNum);
+ m_rMod.MovePage(nOldNum,nNewNum);
}
}
}
@@ -1396,11 +1396,11 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg)
if(!mxPage->IsMasterPage())
return;
- sal_uInt16 nPageCnt(rMod.GetPageCount());
+ sal_uInt16 nPageCnt(m_rMod.GetPageCount());
for(sal_uInt16 nPageNum2(0); nPageNum2 < nPageCnt; nPageNum2++)
{
- SdrPage* pDrawPage = rMod.GetPage(nPageNum2);
+ SdrPage* pDrawPage = m_rMod.GetPage(nPageNum2);
if(pDrawPage->TRG_HasMasterPage())
{
@@ -1410,10 +1410,10 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg)
{
if(!pUndoGroup)
{
- pUndoGroup.reset( new SdrUndoGroup(rMod) );
+ pUndoGroup.reset( new SdrUndoGroup(m_rMod) );
}
-
pUndoGroup->AddAction(rMod.GetSdrUndoFactory().CreateUndoPageRemoveMasterPage(*pDrawPage));
+
pUndoGroup->AddAction(m_rMod.GetSdrUndoFactory().CreateUndoPageRemoveMasterPage(*pDrawPage));
}
}
}
