core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/svdundo.hxx       |    6 +++---
 svx/source/svdraw/svdundo.cxx |   28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 61f5006c18b3194f6aaa03e260425dc878cfff79
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 3 09:32:38 2024 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jun 3 12:24:08 2024 +0200

    svx: prefix members of SdrUndoGeoObj
    
    See tdf#94879 for motivation.
    
    Change-Id: Ic34b5e1c7a1b73d688cc4dfc87c03417fe8e987b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168357
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index e1b778064e6d..bc15932fd81c 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -211,10 +211,10 @@ public:
 
 class SVXCORE_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj
 {
-    std::unique_ptr<SdrObjGeoData> pUndoGeo;
-    std::unique_ptr<SdrObjGeoData> pRedoGeo;
+    std::unique_ptr<SdrObjGeoData> m_pUndoGeo;
+    std::unique_ptr<SdrObjGeoData> m_pRedoGeo;
     // If we have a group object:
-    std::unique_ptr<SdrUndoGroup> pUndoGroup;
+    std::unique_ptr<SdrUndoGroup> m_pUndoGroup;
     /// If we have a table object, should its layout change?
     bool mbSkipChangeLayout;
 
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index c7bb38d81ada..7d98d21b7cb4 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -564,21 +564,21 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj)
         // this is a group object!
         // If this were 3D scene, we'd only add an Undo for the scene itself
         // (which we do elsewhere).
-        pUndoGroup.reset(new SdrUndoGroup(mxObj->getSdrModelFromSdrObject()));
+        m_pUndoGroup.reset(new 
SdrUndoGroup(mxObj->getSdrModelFromSdrObject()));
         for (const rtl::Reference<SdrObject>& pObj : *pOL)
-            pUndoGroup->AddAction(std::make_unique<SdrUndoGeoObj>(*pObj));
+            m_pUndoGroup->AddAction(std::make_unique<SdrUndoGeoObj>(*pObj));
     }
     else
     {
-        pUndoGeo = mxObj->GetGeoData();
+        m_pUndoGeo = mxObj->GetGeoData();
     }
 }
 
 SdrUndoGeoObj::~SdrUndoGeoObj()
 {
-    pUndoGeo.reset();
-    pRedoGeo.reset();
-    pUndoGroup.reset();
+    m_pUndoGeo.reset();
+    m_pRedoGeo.reset();
+    m_pUndoGroup.reset();
 }
 
 void SdrUndoGeoObj::Undo()
@@ -586,21 +586,21 @@ void SdrUndoGeoObj::Undo()
     // Trigger PageChangeCall
     ImpShowPageOfThisObject();
 
-    if(pUndoGroup)
+    if(m_pUndoGroup)
     {
-        pUndoGroup->Undo();
+        m_pUndoGroup->Undo();
 
         // only repaint, no objectchange
         mxObj->ActionChanged();
     }
     else
     {
-        pRedoGeo = mxObj->GetGeoData();
+        m_pRedoGeo = mxObj->GetGeoData();
 
         auto pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(mxObj.get());
         if (pTableObj && mbSkipChangeLayout)
             pTableObj->SetSkipChangeLayout(true);
-        mxObj->SetGeoData(*pUndoGeo);
+        mxObj->SetGeoData(*m_pUndoGeo);
         if (pTableObj && mbSkipChangeLayout)
             pTableObj->SetSkipChangeLayout(false);
     }
@@ -608,17 +608,17 @@ void SdrUndoGeoObj::Undo()
 
 void SdrUndoGeoObj::Redo()
 {
-    if(pUndoGroup)
+    if(m_pUndoGroup)
     {
-        pUndoGroup->Redo();
+        m_pUndoGroup->Redo();
 
         // only repaint, no objectchange
         mxObj->ActionChanged();
     }
     else
     {
-        pUndoGeo = mxObj->GetGeoData();
-        mxObj->SetGeoData(*pRedoGeo);
+        m_pUndoGeo = mxObj->GetGeoData();
+        mxObj->SetGeoData(*m_pRedoGeo);
     }
 
     // Trigger PageChangeCall