core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/xhatch.hxx       |   26 +++++++++++++-------------
 svx/source/xoutdev/xattr.cxx |   16 ++++++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit da6a23840d44c40da3989e7c2372b2b6d9ae95b5
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Mar 11 08:41:15 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Mar 11 14:03:30 2024 +0100

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

diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx
index 1553141e5950..dc56f20a8107 100644
--- a/include/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
@@ -31,27 +31,27 @@
 
 class SVXCORE_DLLPUBLIC XHatch final
 {
-    css::drawing::HatchStyle     eStyle;
-    Color           aColor;
-    tools::Long     nDistance;
-    Degree10        nAngle;
+    css::drawing::HatchStyle     m_eStyle;
+    Color           m_aColor;
+    tools::Long     m_nDistance;
+    Degree10        m_nAngle;
 
 public:
-                    XHatch() : eStyle(css::drawing::HatchStyle_SINGLE), 
nDistance(0), nAngle(0) {}
+                    XHatch() : m_eStyle(css::drawing::HatchStyle_SINGLE), 
m_nDistance(0), m_nAngle(0) {}
                     XHatch(const Color& rCol, css::drawing::HatchStyle eStyle 
= css::drawing::HatchStyle_SINGLE,
                            tools::Long nDistance = 20, Degree10 nAngle = 
0_deg10);
 
     bool operator==(const XHatch& rHatch) const;
 
-    void            SetHatchStyle(css::drawing::HatchStyle eNewStyle) { eStyle 
= eNewStyle; }
-    void            SetColor(const Color& rColor) { aColor = rColor; }
-    void            SetDistance(tools::Long nNewDistance) { nDistance = 
nNewDistance; }
-    void            SetAngle(Degree10 nNewAngle) { nAngle = nNewAngle; }
+    void            SetHatchStyle(css::drawing::HatchStyle eNewStyle) { 
m_eStyle = eNewStyle; }
+    void            SetColor(const Color& rColor) { m_aColor = rColor; }
+    void            SetDistance(tools::Long nNewDistance) { m_nDistance = 
nNewDistance; }
+    void            SetAngle(Degree10 nNewAngle) { m_nAngle = nNewAngle; }
 
-    css::drawing::HatchStyle     GetHatchStyle() const { return eStyle; }
-    const Color&    GetColor() const { return aColor; }
-    tools::Long     GetDistance() const { return nDistance; }
-    Degree10        GetAngle() const { return nAngle; }
+    css::drawing::HatchStyle     GetHatchStyle() const { return m_eStyle; }
+    const Color&    GetColor() const { return m_aColor; }
+    tools::Long     GetDistance() const { return m_nDistance; }
+    Degree10        GetAngle() const { return m_nAngle; }
 };
 
 #endif
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 5db227e9fca7..22f8f62bbeaa 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2649,19 +2649,19 @@ boost::property_tree::ptree 
XFillFloatTransparenceItem::dumpAsJSON() const
 
 XHatch::XHatch(const Color& rCol, css::drawing::HatchStyle eTheStyle, 
tools::Long nTheDistance,
                Degree10 nTheAngle) :
-    eStyle(eTheStyle),
-    aColor(rCol),
-    nDistance(nTheDistance),
-    nAngle(nTheAngle)
+    m_eStyle(eTheStyle),
+    m_aColor(rCol),
+    m_nDistance(nTheDistance),
+    m_nAngle(nTheAngle)
 {
 }
 
 bool XHatch::operator==(const XHatch& rHatch) const
 {
-    return ( eStyle     == rHatch.eStyle    &&
-             aColor     == rHatch.aColor    &&
-             nDistance  == rHatch.nDistance &&
-             nAngle     == rHatch.nAngle );
+    return ( m_eStyle     == rHatch.m_eStyle    &&
+             m_aColor     == rHatch.m_aColor    &&
+             m_nDistance  == rHatch.m_nDistance &&
+             m_nAngle     == rHatch.m_nAngle );
 }