include/svx/svdundo.hxx | 2 +- svx/source/svdraw/svdundo.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit f2ba39c5e7ae28a832e707667a0a61736f65ebda Author: Miklos Vajna <[email protected]> AuthorDate: Tue May 21 08:32:27 2024 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Tue May 21 13:05:42 2024 +0200 svx: prefix members of SdrUndoDelPage See tdf#94879 for motivation. Change-Id: I6ef4ca1df66f22e4fb6a13a7b39ca0152484fd6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167883 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 5af5c584eda1..e1b778064e6d 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -594,7 +594,7 @@ class SVXCORE_DLLPUBLIC SdrUndoDelPage final : public SdrUndoPageList { // When deleting a MasterPage, we remember all relations of the // Character Page with the MasterPage in this UndoGroup. - std::unique_ptr<SdrUndoGroup> pUndoGroup; + std::unique_ptr<SdrUndoGroup> m_pUndoGroup; std::unique_ptr<SfxPoolItem> mpFillBitmapItem; bool mbHasFillBitmap; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 1b52ee945957..bec090c6339c 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1408,12 +1408,12 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) if(mxPage.get() == &rMasterPage) { - if(!pUndoGroup) + if(!m_pUndoGroup) { - pUndoGroup.reset( new SdrUndoGroup(m_rMod) ); + m_pUndoGroup.reset( new SdrUndoGroup(m_rMod) ); } - pUndoGroup->AddAction(m_rMod.GetSdrUndoFactory().CreateUndoPageRemoveMasterPage(*pDrawPage)); + m_pUndoGroup->AddAction(m_rMod.GetSdrUndoFactory().CreateUndoPageRemoveMasterPage(*pDrawPage)); } } } @@ -1428,10 +1428,10 @@ void SdrUndoDelPage::Undo() if (bool(mpFillBitmapItem)) restoreFillBitmap(); ImpInsertPage(nPageNum); - if (pUndoGroup!=nullptr) + if (m_pUndoGroup!=nullptr) { // recover master page relationships - pUndoGroup->Undo(); + m_pUndoGroup->Undo(); } }
