core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/svddrgmt.hxx       |    8 ++++----
 svx/source/svdraw/svddrgmt.cxx |   38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit ff68535068169d86cf95907c5e6a3a0aee94cb49
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 25 08:17:13 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 25 09:21:11 2024 +0100

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

diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 58639bc85df5..3352f09196b3 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -228,10 +228,10 @@ inline const tools::Rectangle& 
SdrDragMethod::GetMarkedRect() const
 class SVXCORE_DLLPUBLIC SdrDragMove : public SdrDragMethod
 {
 private:
-    tools::Long                        nBestXSnap;
-    tools::Long                        nBestYSnap;
-    bool                        bXSnapped;
-    bool                        bYSnapped;
+    tools::Long                        m_nBestXSnap;
+    tools::Long                        m_nBestYSnap;
+    bool                        m_bXSnapped;
+    bool                        m_bYSnapped;
 
     void ImpCheckSnap(const Point& rPt);
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 885dd8fcc277..7e2a812e430e 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1470,10 +1470,10 @@ void 
SdrDragMove::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
 
 SdrDragMove::SdrDragMove(SdrDragView& rNewView)
     : SdrDragMethod(rNewView)
-    , nBestXSnap(0)
-    , nBestYSnap(0)
-    , bXSnapped(false)
-    , bYSnapped(false)
+    , m_nBestXSnap(0)
+    , m_nBestYSnap(0)
+    , m_bXSnapped(false)
+    , m_bYSnapped(false)
 {
     setMoveOnly(true);
 }
@@ -1518,43 +1518,43 @@ void SdrDragMove::ImpCheckSnap(const Point& rPt)
 
     if (nRet & SdrSnap::XSNAPPED)
     {
-        if (bXSnapped)
+        if (m_bXSnapped)
         {
-            if (std::abs(aPt.X())<std::abs(nBestXSnap))
+            if (std::abs(aPt.X())<std::abs(m_nBestXSnap))
             {
-                nBestXSnap=aPt.X();
+                m_nBestXSnap=aPt.X();
             }
         }
         else
         {
-            nBestXSnap=aPt.X();
-            bXSnapped=true;
+            m_nBestXSnap=aPt.X();
+            m_bXSnapped=true;
         }
     }
 
     if (!(nRet & SdrSnap::YSNAPPED))
         return;
 
-    if (bYSnapped)
+    if (m_bYSnapped)
     {
-        if (std::abs(aPt.Y())<std::abs(nBestYSnap))
+        if (std::abs(aPt.Y())<std::abs(m_nBestYSnap))
         {
-            nBestYSnap=aPt.Y();
+            m_nBestYSnap=aPt.Y();
         }
     }
     else
     {
-        nBestYSnap=aPt.Y();
-        bYSnapped=true;
+        m_nBestYSnap=aPt.Y();
+        m_bYSnapped=true;
     }
 }
 
 void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
 {
-    nBestXSnap=0;
-    nBestYSnap=0;
-    bXSnapped=false;
-    bYSnapped=false;
+    m_nBestXSnap=0;
+    m_nBestYSnap=0;
+    m_bXSnapped=false;
+    m_bYSnapped=false;
     Point aNoSnapPnt(rNoSnapPnt_);
     const tools::Rectangle& aSR=GetMarkedRect();
     tools::Long nMovedx=aNoSnapPnt.X()-DragStat().GetStart().X();
@@ -1572,7 +1572,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
         ImpCheckSnap(aRU);
     }
 
-    Point aPnt(aNoSnapPnt.X()+nBestXSnap,aNoSnapPnt.Y()+nBestYSnap);
+    Point aPnt(aNoSnapPnt.X()+m_nBestXSnap,aNoSnapPnt.Y()+m_nBestYSnap);
     bool bOrtho=getSdrDragView().IsOrtho();
 
     if (bOrtho)