core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/cube3d.hxx         |   12 ++++++------
 svx/source/engine3d/cube3d.cxx |   28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit c8606fc09b81d2666095d4cb4d8a813ef0ba1cc2
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 4 08:18:14 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 4 14:31:42 2024 +0100

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

diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 7fff9931f642..30995a070f3c 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -47,11 +47,11 @@ class E3dDefaultAttributes;
 class SAL_WARN_UNUSED E3dCubeObj final : public E3dCompoundObject
 {
     // Parameter
-    basegfx::B3DPoint                   aCubePos;
-    basegfx::B3DVector                  aCubeSize;
+    basegfx::B3DPoint                   m_aCubePos;
+    basegfx::B3DVector                  m_aCubeSize;
 
     // BOOLeans
-    bool                                bPosIsCenter : 1;
+    bool                                m_bPosIsCenter : 1;
 
     void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
     virtual std::unique_ptr<sdr::contact::ViewContact> 
CreateObjectSpecificViewContact() override;
@@ -75,13 +75,13 @@ public:
 
     // Set local parameters with geometry recreation
     void SetCubePos(const basegfx::B3DPoint& rNew);
-    const basegfx::B3DPoint& GetCubePos() const { return aCubePos; }
+    const basegfx::B3DPoint& GetCubePos() const { return m_aCubePos; }
 
     void SetCubeSize(const basegfx::B3DVector& rNew);
-    const basegfx::B3DVector& GetCubeSize() const { return aCubeSize; }
+    const basegfx::B3DVector& GetCubeSize() const { return m_aCubeSize; }
 
     void SetPosIsCenter(bool bNew);
-    bool GetPosIsCenter() const { return bPosIsCenter; }
+    bool GetPosIsCenter() const { return m_bPosIsCenter; }
 
     // TakeObjName...() is for the display in the UI, for example "3 frames 
selected".
     virtual OUString TakeObjNameSingul() const override;
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 94e482659b97..42a215dd3477 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -46,8 +46,8 @@ E3dCubeObj::E3dCubeObj(
     SetDefaultAttributes(rDefault);
 
     // position centre or left, bottom, back (dependent on bPosIsCenter)
-    aCubePos = aPos;
-    aCubeSize = r3DSize;
+    m_aCubePos = aPos;
+    m_aCubeSize = r3DSize;
 }
 
 E3dCubeObj::E3dCubeObj(SdrModel& rSdrModel)
@@ -67,9 +67,9 @@ E3dCubeObj::E3dCubeObj(SdrModel& rSdrModel, E3dCubeObj const 
& rSource)
 
     SetDefaultAttributes(aDefault);
 
-    aCubePos = rSource.aCubePos;
-    aCubeSize = rSource.aCubeSize;
-    bPosIsCenter = rSource.bPosIsCenter;
+    m_aCubePos = rSource.m_aCubePos;
+    m_aCubeSize = rSource.m_aCubeSize;
+    m_bPosIsCenter = rSource.m_bPosIsCenter;
 }
 
 E3dCubeObj::~E3dCubeObj()
@@ -78,9 +78,9 @@ E3dCubeObj::~E3dCubeObj()
 
 void E3dCubeObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
 {
-    aCubePos = rDefault.GetDefaultCubePos();
-    aCubeSize = rDefault.GetDefaultCubeSize();
-    bPosIsCenter = rDefault.GetDefaultCubePosIsCenter();
+    m_aCubePos = rDefault.GetDefaultCubePos();
+    m_aCubeSize = rDefault.GetDefaultCubeSize();
+    m_bPosIsCenter = rDefault.GetDefaultCubePosIsCenter();
 }
 
 SdrObjKind E3dCubeObj::GetObjIdentifier() const
@@ -104,27 +104,27 @@ rtl::Reference<SdrObject> 
E3dCubeObj::CloneSdrObject(SdrModel& rTargetModel) con
 
 void E3dCubeObj::SetCubePos(const basegfx::B3DPoint& rNew)
 {
-    if(aCubePos != rNew)
+    if(m_aCubePos != rNew)
     {
-        aCubePos = rNew;
+        m_aCubePos = rNew;
         ActionChanged();
     }
 }
 
 void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
 {
-    if(aCubeSize != rNew)
+    if(m_aCubeSize != rNew)
     {
-        aCubeSize = rNew;
+        m_aCubeSize = rNew;
         ActionChanged();
     }
 }
 
 void E3dCubeObj::SetPosIsCenter(bool bNew)
 {
-    if(bPosIsCenter != bNew)
+    if(m_bPosIsCenter != bNew)
     {
-        bPosIsCenter = bNew;
+        m_bPosIsCenter = bNew;
         ActionChanged();
     }
 }