include/svx/svdundo.hxx | 2 +- svx/source/svdraw/svdundo.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit c88af36d32241458ce9b30eed35d4753716b4169 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Aug 5 08:07:15 2024 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Aug 5 13:23:13 2024 +0200 svx: prefix members of SdrUndoReplaceObj See tdf#94879 for motivation. Change-Id: I70d2a1c4b1918683085d40208bed6f5f28ebee1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171471 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 60c79d3bf7c3..c0154665c288 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -346,7 +346,7 @@ public: class SVXCORE_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj { - SdrObjList* pObjList; + SdrObjList* m_pObjList; rtl::Reference<SdrObject> mxNewObj; public: diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index a0454fc5c860..71dcfde35fbb 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -841,7 +841,7 @@ SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1) : SdrUndoObj(rOldObj1) , mxNewObj(&rNewObj1) { - pObjList=mxObj->getParentSdrObjListFromSdrObject(); + m_pObjList=mxObj->getParentSdrObjListFromSdrObject(); } SdrUndoReplaceObj::~SdrUndoReplaceObj() @@ -857,13 +857,13 @@ void SdrUndoReplaceObj::Undo() DBG_ASSERT(mxNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): New object is not inserted!"); ImplUnmarkObject( mxNewObj.get() ); - pObjList->ReplaceObject(mxObj.get(), mxNewObj->GetOrdNum()); + m_pObjList->ReplaceObject(mxObj.get(), mxNewObj->GetOrdNum()); } void SdrUndoReplaceObj::Redo() { ImplUnmarkObject( mxObj.get() ); - pObjList->ReplaceObject(mxNewObj.get(), mxObj->GetOrdNum()); + m_pObjList->ReplaceObject(mxNewObj.get(), mxObj->GetOrdNum()); // Trigger PageChangeCall ImpShowPageOfThisObject();