diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-05-17 14:27:49 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-05-20 04:38:36 +0200 |
| commit | 028c974cf2fcb9494f42267edf1427cb45342f39 (patch) | |
| tree | 916a7792e01d2b2bffbb04e0a1933292cfa8c627 /editeng | |
| parent | 45826e60d5f1508d54b0f0a4d98b0e2ebe94a097 (diff) | |
prefix SvxBorderLine aColor attribute
Change-Id: I77f950a88e5875469a95c3ec37716b99328672f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151855
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/borderline.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
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)) ) { |