diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2024-05-06 08:19:53 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2024-05-06 10:00:58 +0200 |
commit | 9683305264568d77a1d912f4b0d2e063455feeae (patch) | |
tree | 4f15926398e8365bfcdadfb5190b73a88ca2ca24 /svx | |
parent | 6d5d9eaa61505cebaf3bde4bfc157d8e19fec8de (diff) |
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 <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/fmundo.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdundo.cxx | 24 |
2 files changed, 16 insertions, 16 deletions
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)); } } } |