core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/svdundo.hxx       |   12 ++++++------
 svx/source/svdraw/svdundo.cxx |   10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 279246a6e8058d4b0125e5a59c46974af7f09d73
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 17 08:04:35 2024 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jun 17 13:24:41 2024 +0200

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

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index bc15932fd81c..743afaced0e3 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -94,10 +94,10 @@ class SVXCORE_DLLPUBLIC SdrUndoGroup final : public 
SdrUndoAction
     std::vector<std::unique_ptr<SdrUndoAction>> maActions;
 
     // No expanded description of the Action (contains %O)
-    OUString aComment;
-    OUString aObjDescription;
+    OUString m_aComment;
+    OUString m_aObjDescription;
 
-    SdrRepeatFunc eFunction;
+    SdrRepeatFunc m_eFunction;
 
 public:
     SdrUndoGroup(SdrModel& rNewMod);
@@ -107,8 +107,8 @@ public:
     SdrUndoAction* GetAction(sal_Int32 nNum) const { return 
maActions[nNum].get(); }
     void AddAction(std::unique_ptr<SdrUndoAction> pAct);
 
-    void SetComment(const OUString& rStr) { aComment=rStr; }
-    void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; }
+    void SetComment(const OUString& rStr) { m_aComment=rStr; }
+    void SetObjDescription(const OUString& rStr) { m_aObjDescription=rStr; }
     virtual OUString GetComment() const override;
     virtual OUString GetSdrRepeatComment() const override;
 
@@ -117,7 +117,7 @@ public:
 
     virtual bool CanSdrRepeat(SdrView& rView) const override;
     virtual void SdrRepeat(SdrView& rView) override;
-    void SetRepeatFunction(SdrRepeatFunc eFunc) { eFunction=eFunc; }
+    void SetRepeatFunction(SdrRepeatFunc eFunc) { m_eFunction=eFunc; }
 };
 
 /**
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 7d98d21b7cb4..defe2b362f79 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -110,7 +110,7 @@ ViewShellId SdrUndoAction::GetViewShellId() const
 
 SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod)
 :   SdrUndoAction(rNewMod),
-    eFunction(SdrRepeatFunc::NONE)
+    m_eFunction(SdrRepeatFunc::NONE)
 {}
 
 SdrUndoGroup::~SdrUndoGroup()
@@ -136,12 +136,12 @@ void SdrUndoGroup::Redo()
 
 OUString SdrUndoGroup::GetComment() const
 {
-    return aComment.replaceAll("%1", aObjDescription);
+    return m_aComment.replaceAll("%1", m_aObjDescription);
 }
 
 bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
 {
-    switch (eFunction)
+    switch (m_eFunction)
     {
     case SdrRepeatFunc::NONE           :  return false;
     case SdrRepeatFunc::Delete         :  return 
rView.GetMarkedObjectList().GetMarkCount() != 0;
@@ -166,7 +166,7 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
 
 void SdrUndoGroup::SdrRepeat(SdrView& rView)
 {
-    switch (eFunction)
+    switch (m_eFunction)
     {
     case SdrRepeatFunc::NONE            :  break;
     case SdrRepeatFunc::Delete          :  rView.DeleteMarked();               
 break;
@@ -190,7 +190,7 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
 
 OUString SdrUndoGroup::GetSdrRepeatComment() const
 {
-    return aComment.replaceAll("%1", SvxResId(STR_ObjNameSingulPlural));
+    return m_aComment.replaceAll("%1", SvxResId(STR_ObjNameSingulPlural));
 }
 
 SdrUndoObj::SdrUndoObj(SdrObject& rNewObj)