core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/xflgrit.hxx      |    4 ++--
 svx/source/xoutdev/xattr.cxx |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit e3c0aeec8385cba90b4fb21d2c9032efa61a8e82
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Feb 19 08:00:48 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 19 09:11:25 2024 +0100

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

diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index c8594753e5c0..97c0b072352c 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -30,7 +30,7 @@ class SdrModel;
 
 class SVXCORE_DLLPUBLIC XFillGradientItem : public NameOrIndex
 {
-    basegfx::BGradient   aGradient;
+    basegfx::BGradient   m_aGradient;
 
 public:
             static SfxPoolItem* CreateDefault();
@@ -50,7 +50,7 @@ public:
                                   MapUnit ePresMetric,
                                   OUString &rText, const IntlWrapper& ) const 
override;
     const basegfx::BGradient&        GetGradientValue() const; // GetValue -> 
GetGradientValue
-    void                    SetGradientValue(const basegfx::BGradient& rNew) { 
aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
+    void                    SetGradientValue(const basegfx::BGradient& rNew) { 
m_aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
 
     static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 
);
     std::unique_ptr<XFillGradientItem> checkForUniqueItem( SdrModel* pModel ) 
const;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index c4dd3d292b00..b1747eea65ba 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -2212,26 +2212,26 @@ SfxPoolItem* XFillGradientItem::CreateDefault() { 
return new XFillGradientItem;
 XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
                                    const basegfx::BGradient& rTheGradient) :
     NameOrIndex(XATTR_FILLGRADIENT, nIndex),
-    aGradient(rTheGradient)
+    m_aGradient(rTheGradient)
 {
 }
 
 XFillGradientItem::XFillGradientItem(const OUString& rName,
                                    const basegfx::BGradient& rTheGradient, 
TypedWhichId<XFillGradientItem> nWhich)
     : NameOrIndex(nWhich, rName)
-    , aGradient(rTheGradient)
+    , m_aGradient(rTheGradient)
 {
 }
 
 XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
     NameOrIndex(rItem),
-    aGradient(rItem.aGradient)
+    m_aGradient(rItem.m_aGradient)
 {
 }
 
 XFillGradientItem::XFillGradientItem( const basegfx::BGradient& rTheGradient )
 :   NameOrIndex( XATTR_FILLGRADIENT, -1 ),
-    aGradient(rTheGradient)
+    m_aGradient(rTheGradient)
 {
 }
 
@@ -2243,16 +2243,16 @@ XFillGradientItem* 
XFillGradientItem::Clone(SfxItemPool* /*pPool*/) const
 bool XFillGradientItem::operator==(const SfxPoolItem& rItem) const
 {
     return ( NameOrIndex::operator==(rItem) &&
-             aGradient == static_cast<const 
XFillGradientItem&>(rItem).aGradient );
+             m_aGradient == static_cast<const 
XFillGradientItem&>(rItem).m_aGradient );
 }
 
 const basegfx::BGradient& XFillGradientItem::GetGradientValue() const // 
GetValue -> GetGradientValue
 {
     if (!IsIndex())
-        return aGradient;
+        return m_aGradient;
     // ToDo: This should fail. We never called this code with a table so this 
should always
     // have failed. Thus, I'm thinking that XFillGradientItem can't be an 
Index.
-    return aGradient;
+    return m_aGradient;
 }
 
 bool XFillGradientItem::GetPresentation
@@ -2485,7 +2485,7 @@ std::unique_ptr<XFillGradientItem> 
XFillGradientItem::checkForUniqueItem( SdrMod
 
         // if the given name is not valid, replace it!
         if( aUniqueName != GetName() )
-            return std::make_unique<XFillGradientItem>( aUniqueName, 
aGradient, TypedWhichId<XFillGradientItem>(Which()) );
+            return std::make_unique<XFillGradientItem>( aUniqueName, 
m_aGradient, TypedWhichId<XFillGradientItem>(Which()) );
     }
 
     return nullptr;