core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/xcolit.hxx       |    4 ++--
 svx/source/xoutdev/xattr.cxx |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit cdde4687ea0da4d101567a64fa0d60103f353d68
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jan 2 09:05:24 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Jan 2 09:58:18 2024 +0100

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

diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 26941279490c..a89a1f37e97f 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -30,7 +30,7 @@ class XColorList;
 
 class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex
 {
-    Color   aColor;
+    Color   m_aColor;
     model::ComplexColor maComplexColor;
 
 public:
@@ -47,7 +47,7 @@ public:
     virtual XColorItem* Clone(SfxItemPool* pPool = nullptr) const override;
 
     const Color&    GetColorValue() const;
-    void            SetColorValue(const Color& rNew) { aColor = rNew; 
Detach(); }
+    void            SetColorValue(const Color& rNew) { m_aColor = rNew; 
Detach(); }
 
     void setComplexColor(model::ComplexColor const& rComplexColor) { 
maComplexColor = rComplexColor; }
     const model::ComplexColor& getComplexColor() const { return 
maComplexColor; }
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 2404a59edb50..957f6d0ffb26 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -265,25 +265,25 @@ SfxPoolItem* XColorItem::CreateDefault() { return new 
XColorItem; }
 
 XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, sal_Int32 nIndex, 
const Color& rTheColor) :
     NameOrIndex(_nWhich, nIndex),
-    aColor(rTheColor)
+    m_aColor(rTheColor)
 {
 }
 
 XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, const OUString& 
rName, const Color& rTheColor) :
     NameOrIndex(_nWhich, rName),
-    aColor(rTheColor)
+    m_aColor(rTheColor)
 {
 }
 
 XColorItem::XColorItem(TypedWhichId<XColorItem> _nWhich, const Color& 
rTheColor)
     : NameOrIndex(_nWhich, OUString())
-    , aColor(rTheColor)
+    , m_aColor(rTheColor)
 {
 }
 
 XColorItem::XColorItem(const XColorItem& rItem) :
     NameOrIndex(rItem),
-    aColor(rItem.aColor),
+    m_aColor(rItem.m_aColor),
     maComplexColor(rItem.maComplexColor)
 {
 }
@@ -296,14 +296,14 @@ XColorItem* XColorItem::Clone(SfxItemPool* /*pPool*/) 
const
 bool XColorItem::operator==(const SfxPoolItem& rItem) const
 {
     return ( NameOrIndex::operator==(rItem) &&
-            static_cast<const XColorItem&>(rItem).aColor == aColor ) &&
+            static_cast<const XColorItem&>(rItem).m_aColor == m_aColor ) &&
             static_cast<const XColorItem&>(rItem).maComplexColor == 
maComplexColor;
 }
 
 const Color& XColorItem::GetColorValue() const
 {
     assert(!IsIndex());
-    return aColor;
+    return m_aColor;
 
 }
 
@@ -386,7 +386,7 @@ void XColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const
         (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), 
BAD_CAST("XATTR_FILLCOLOR"));
     }
     (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aColor"),
-                                
BAD_CAST(aColor.AsRGBHexString().toUtf8().getStr()));
+                                
BAD_CAST(m_aColor.AsRGBHexString().toUtf8().getStr()));
 
     NameOrIndex::dumpAsXml(pWriter);