core.git: include/svx svx/source sw/source

[Miklos Vajna (via logerrit)]

 include/svx/svdovirt.hxx         |    2 +-
 svx/source/svdraw/svdovirt.cxx   |   18 +++++++++---------
 sw/source/core/draw/dcontact.cxx |   16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 6e781525c4781e1b62dfd03f0352a82386c94019
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 20 08:10:05 2025 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 20 09:40:50 2025 +0100

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

diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 2b47f25cbc57..01bfe1925f85 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -40,7 +40,7 @@ protected:
     virtual std::unique_ptr<sdr::contact::ViewContact> 
CreateObjectSpecificViewContact() override;
 
     rtl::Reference<SdrObject> mxRefObj; // Referenced drawing object
-    tools::Rectangle aSnapRect;
+    tools::Rectangle maSnapRect;
 
 protected:
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 2a4bc1e68c4d..89ef01f54a51 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -64,7 +64,7 @@ SdrVirtObj::SdrVirtObj(
 
     mxRefObj->AddReference(*this);
 
-    aSnapRect = rSource.aSnapRect;
+    maSnapRect = rSource.maSnapRect;
     m_aAnchor = rSource.m_aAnchor;
 }
 
@@ -433,15 +433,15 @@ void SdrVirtObj::Shear(const Point& rRef, Degree100 
nAngle, double tn, bool bVSh
 
 void SdrVirtObj::RecalcSnapRect()
 {
-    aSnapRect=mxRefObj->GetSnapRect();
-    aSnapRect+=m_aAnchor;
+    maSnapRect=mxRefObj->GetSnapRect();
+    maSnapRect+=m_aAnchor;
 }
 
 const tools::Rectangle& SdrVirtObj::GetSnapRect() const
 {
-    const_cast<SdrVirtObj*>(this)->aSnapRect=mxRefObj->GetSnapRect();
-    const_cast<SdrVirtObj*>(this)->aSnapRect+=m_aAnchor;
-    return aSnapRect;
+    const_cast<SdrVirtObj*>(this)->maSnapRect=mxRefObj->GetSnapRect();
+    const_cast<SdrVirtObj*>(this)->maSnapRect+=m_aAnchor;
+    return maSnapRect;
 }
 
 void SdrVirtObj::SetSnapRect(const tools::Rectangle& rRect)
@@ -465,9 +465,9 @@ void SdrVirtObj::NbcSetSnapRect(const tools::Rectangle& 
rRect)
 
 const tools::Rectangle& SdrVirtObj::GetLogicRect() const
 {
-    const_cast<SdrVirtObj*>(this)->aSnapRect=mxRefObj->GetLogicRect();  // An 
abuse of aSnapRect!
-    const_cast<SdrVirtObj*>(this)->aSnapRect+=m_aAnchor;                // If 
there's trouble, we need another Rectangle Member (or a Heap).
-    return aSnapRect;
+    const_cast<SdrVirtObj*>(this)->maSnapRect=mxRefObj->GetLogicRect();  // An 
abuse of aSnapRect!
+    const_cast<SdrVirtObj*>(this)->maSnapRect+=m_aAnchor;                // If 
there's trouble, we need another Rectangle Member (or a Heap).
+    return maSnapRect;
 }
 
 void SdrVirtObj::SetLogicRect(const tools::Rectangle& rRect)
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 0f13027799ba..d37d12502109 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2613,16 +2613,16 @@ void SwDrawVirtObj::Shear(const Point& rRef, Degree100 
nAngle, double tn, bool b
 
 void SwDrawVirtObj::RecalcSnapRect()
 {
-    aSnapRect = mxRefObj->GetSnapRect();
-    aSnapRect += GetOffset();
+    maSnapRect = mxRefObj->GetSnapRect();
+    maSnapRect += GetOffset();
 }
 
 const tools::Rectangle& SwDrawVirtObj::GetSnapRect() const
 {
-    const_cast<SwDrawVirtObj*>(this)->aSnapRect = mxRefObj->GetSnapRect();
-    const_cast<SwDrawVirtObj*>(this)->aSnapRect += GetOffset();
+    const_cast<SwDrawVirtObj*>(this)->maSnapRect = mxRefObj->GetSnapRect();
+    const_cast<SwDrawVirtObj*>(this)->maSnapRect += GetOffset();
 
-    return aSnapRect;
+    return maSnapRect;
 }
 
 void SwDrawVirtObj::SetSnapRect(const tools::Rectangle& rRect)
@@ -2645,10 +2645,10 @@ void SwDrawVirtObj::NbcSetSnapRect(const 
tools::Rectangle& rRect)
 
 const tools::Rectangle& SwDrawVirtObj::GetLogicRect() const
 {
-    const_cast<SwDrawVirtObj*>(this)->aSnapRect = mxRefObj->GetLogicRect();
-    const_cast<SwDrawVirtObj*>(this)->aSnapRect += GetOffset();
+    const_cast<SwDrawVirtObj*>(this)->maSnapRect = mxRefObj->GetLogicRect();
+    const_cast<SwDrawVirtObj*>(this)->maSnapRect += GetOffset();
 
-    return aSnapRect;
+    return maSnapRect;
 }
 
 void SwDrawVirtObj::SetLogicRect(const tools::Rectangle& rRect)