[Libreoffice-commits] core.git: editeng/source include/editeng

[Tomaž Vajngerl (via logerrit)]

 editeng/source/items/borderline.cxx |   40 ++++++++++++++++++------------------
 include/editeng/borderline.hxx      |    6 ++---
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 028c974cf2fcb9494f42267edf1427cb45342f39
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed May 17 14:27:49 2023 +0900
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sat May 20 04:38:36 2023 +0200

    prefix SvxBorderLine aColor attribute
    
    Change-Id: I77f950a88e5875469a95c3ec37716b99328672f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151855
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 42d61b5daa43..698fd2b964b0 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -109,8 +109,8 @@ SvxBorderLine::SvxBorderLine( const Color *pCol, 
tools::Long nWidth,
     , m_bMirrorWidths(false)
     , m_bUseLeftTop(false)
 {
-    if ( pCol )
-        aColor = *pCol;
+    if (pCol)
+        m_aColor = *pCol;
 }
 
 SvxBorderLineStyle
@@ -518,15 +518,15 @@ sal_uInt16 SvxBorderLine::GetDistance() const
 
 bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
 {
-    return ( ( aColor    == rCmp.aColor )            &&
-             ( m_nWidth == rCmp.m_nWidth )           &&
-             ( m_bMirrorWidths  == rCmp.m_bMirrorWidths )  &&
-             ( m_aWidthImpl  == rCmp.m_aWidthImpl )  &&
-             ( m_nStyle == rCmp.GetBorderLineStyle()) &&
-             ( m_bUseLeftTop == rCmp.m_bUseLeftTop ) &&
-             ( m_pColorOutFn == rCmp.m_pColorOutFn ) &&
-             ( m_pColorInFn == rCmp.m_pColorInFn )   &&
-             ( m_pColorGapFn == rCmp.m_pColorGapFn ) );
+    return (m_aColor == rCmp.m_aColor &&
+            m_nWidth == rCmp.m_nWidth &&
+            m_bMirrorWidths == rCmp.m_bMirrorWidths &&
+            m_aWidthImpl == rCmp.m_aWidthImpl &&
+            m_nStyle == rCmp.GetBorderLineStyle() &&
+            m_bUseLeftTop == rCmp.m_bUseLeftTop &&
+            m_pColorOutFn == rCmp.m_pColorOutFn &&
+            m_pColorInFn == rCmp.m_pColorInFn &&
+            m_pColorGapFn == rCmp.m_pColorGapFn);
 }
 
 void SvxBorderLine::SetBorderLineStyle( SvxBorderLineStyle nNew )
@@ -571,14 +571,14 @@ void SvxBorderLine::SetBorderLineStyle( 
SvxBorderLineStyle nNew )
 
 Color SvxBorderLine::GetColorOut( bool bLeftOrTop ) const
 {
-    Color aResult = aColor;
+    Color aResult = m_aColor;
 
     if ( m_aWidthImpl.IsDouble() && m_pColorOutFn != nullptr )
     {
         if ( !bLeftOrTop && m_bUseLeftTop )
-            aResult = (*m_pColorInFn)( aColor );
+            aResult = (*m_pColorInFn)(m_aColor);
         else
-            aResult = (*m_pColorOutFn)( aColor );
+            aResult = (*m_pColorOutFn)(m_aColor);
     }
 
     return aResult;
@@ -586,14 +586,14 @@ Color SvxBorderLine::GetColorOut( bool bLeftOrTop ) const
 
 Color SvxBorderLine::GetColorIn( bool bLeftOrTop ) const
 {
-    Color aResult = aColor;
+    Color aResult = m_aColor;
 
     if ( m_aWidthImpl.IsDouble() && m_pColorInFn != nullptr )
     {
         if ( !bLeftOrTop && m_bUseLeftTop )
-            aResult = (*m_pColorOutFn)( aColor );
+            aResult = (*m_pColorOutFn)(m_aColor);
         else
-            aResult = (*m_pColorInFn)( aColor );
+            aResult = (*m_pColorInFn)(m_aColor);
     }
 
     return aResult;
@@ -601,11 +601,11 @@ Color SvxBorderLine::GetColorIn( bool bLeftOrTop ) const
 
 Color SvxBorderLine::GetColorGap( ) const
 {
-    Color aResult = aColor;
+    Color aResult = m_aColor;
 
     if ( m_aWidthImpl.IsDouble() && m_pColorGapFn != nullptr )
     {
-        aResult = (*m_pColorGapFn)( aColor );
+        aResult = (*m_pColorGapFn)(m_aColor);
     }
 
     return aResult;
@@ -642,7 +642,7 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit,
         RID_DASH_DOT,
         RID_DASH_DOT_DOT
     };
-    OUString aStr = "(" + ::GetColorString( aColor ) + cpDelim;
+    OUString aStr = "(" + ::GetColorString(m_aColor) + cpDelim;
 
     if ( static_cast<int>(m_nStyle) < int(SAL_N_ELEMENTS(aStyleIds)) )
     {
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 6cf1c45120be..affd513e853e 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -153,7 +153,7 @@ class EDITENG_DLLPUBLIC SvxBorderLine final
     Color (*m_pColorInFn)(Color);
     Color (*m_pColorGapFn)(Color);
     BorderWidthImpl m_aWidthImpl;
-    Color aColor;
+    Color m_aColor;
     SvxBorderLineStyle   m_nStyle;
     bool m_bMirrorWidths;
     bool m_bUseLeftTop;
@@ -165,7 +165,7 @@ public:
             Color (*pColorOutFn)( Color ) = &darkColor,
             Color (*pColorInFn)( Color ) = &darkColor );
 
-    const Color&    GetColor() const { return aColor; }
+    const Color&    GetColor() const { return m_aColor; }
     Color           GetColorOut( bool bLeftOrTop = true ) const;
     Color           GetColorIn( bool bLeftOrTop = true ) const;
     bool            HasGapColor() const { return m_pColorGapFn != nullptr; }
@@ -208,7 +208,7 @@ public:
 
     SvxBorderLineStyle  GetBorderLineStyle() const { return m_nStyle; }
 
-    void            SetColor( const Color &rColor ) { aColor = rColor; }
+    void            SetColor( const Color &rColor ) { m_aColor = rColor; }
     void            SetBorderLineStyle( SvxBorderLineStyle nNew );
     void            ScaleMetrics( tools::Long nMult, tools::Long nDiv );