core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/xlndsit.hxx      |    6 +++---
 svx/source/xoutdev/xattr.cxx |   16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit ce613d65dd3cbf3a6c153201ac81730813691821
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Mar 31 08:09:52 2025 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Mar 31 10:00:59 2025 +0200

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

diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 635769e505fa..8bbf56c61f71 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -32,7 +32,7 @@ class SdrModel;
 
 class SVXCORE_DLLPUBLIC XLineDashItem final : public NameOrIndex
 {
-    XDash   aDash;
+    XDash   m_aDash;
 
 public:
                             static SfxPoolItem* CreateDefault();
@@ -55,8 +55,8 @@ public:
     virtual bool            HasMetrics() const override;
     virtual void            ScaleMetrics(tools::Long nMul, tools::Long nDiv) 
override;
 
-    const XDash&            GetDashValue() const { return aDash;}
-    void                    SetDashValue(const XDash& rNew)   { aDash = rNew; 
Detach(); } // SetValue -> SetDashValue
+    const XDash&            GetDashValue() const { return m_aDash;}
+    void                    SetDashValue(const XDash& rNew)   { m_aDash = 
rNew; Detach(); } // SetValue -> SetDashValue
 
     static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 
);
     std::unique_ptr<XLineDashItem> checkForUniqueItem( SdrModel& rModel ) 
const;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index ab2e53351eec..d368d0a7bbdb 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -665,19 +665,19 @@ SfxPoolItem* XLineDashItem::CreateDefault() {return new 
XLineDashItem;}
 
 XLineDashItem::XLineDashItem(const OUString& rName, const XDash& rTheDash) :
     NameOrIndex(XATTR_LINEDASH, rName),
-    aDash(rTheDash)
+    m_aDash(rTheDash)
 {
 }
 
 XLineDashItem::XLineDashItem(const XLineDashItem& rItem) :
     NameOrIndex(rItem),
-    aDash(rItem.aDash)
+    m_aDash(rItem.m_aDash)
 {
 }
 
 XLineDashItem::XLineDashItem(const XDash& rTheDash)
 :   NameOrIndex( XATTR_LINEDASH, -1 ),
-    aDash(rTheDash)
+    m_aDash(rTheDash)
 {
 }
 
@@ -689,7 +689,7 @@ XLineDashItem* XLineDashItem::Clone(SfxItemPool* /*pPool*/) 
const
 bool XLineDashItem::operator==(const SfxPoolItem& rItem) const
 {
     return ( NameOrIndex::operator==(rItem) &&
-             aDash == static_cast<const XLineDashItem&>(rItem).aDash );
+             m_aDash == static_cast<const XLineDashItem&>(rItem).m_aDash );
 }
 
 bool XLineDashItem::GetPresentation
@@ -711,9 +711,9 @@ bool XLineDashItem::HasMetrics() const
 
 void XLineDashItem::ScaleMetrics(tools::Long nMul, tools::Long nDiv)
 {
-    aDash.SetDotLen( BigInt::Scale( aDash.GetDotLen(), nMul, nDiv ) );
-    aDash.SetDashLen( BigInt::Scale( aDash.GetDashLen(), nMul, nDiv ) );
-    aDash.SetDistance( BigInt::Scale( aDash.GetDistance(), nMul, nDiv ) );
+    m_aDash.SetDotLen( BigInt::Scale( m_aDash.GetDotLen(), nMul, nDiv ) );
+    m_aDash.SetDashLen( BigInt::Scale( m_aDash.GetDashLen(), nMul, nDiv ) );
+    m_aDash.SetDistance( BigInt::Scale( m_aDash.GetDistance(), nMul, nDiv ) );
 }
 
 bool XLineDashItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) 
const
@@ -972,7 +972,7 @@ std::unique_ptr<XLineDashItem> 
XLineDashItem::checkForUniqueItem( SdrModel& rMod
 
     // if the given name is not valid, replace it!
     if( aUniqueName != GetName() )
-        return std::make_unique<XLineDashItem>( aUniqueName, aDash );
+        return std::make_unique<XLineDashItem>( aUniqueName, m_aDash );
 
     return nullptr;
 }