diff options
Diffstat (limited to 'editeng/source/items/borderline.cxx')
| -rw-r--r-- | editeng/source/items/borderline.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index b344ee120fcf..7470f5a9b0b6 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -35,6 +35,9 @@ #include <editeng/borderline.hxx> #include <editeng/itemtype.hxx> + +using namespace ::com::sun::star::table::BorderLineStyle; + // class SvxBorderLine -------------------------------------------------- namespace { @@ -128,7 +131,7 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle nStyle ) switch ( nStyle ) { // No line: no width - case NO_STYLE: + case NONE: aImpl = BorderWidthImpl( 0, 0.0 ); break; @@ -244,7 +247,8 @@ void SvxBorderLine::ScaleMetrics( long nMult, long nDiv ) void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sal_uInt16 nIn, sal_uInt16 nDist ) { - if ( nStyle == NO_STYLE ) { + if (NONE == nStyle) + { nStyle = SOLID; if ( nOut > 0 && nIn > 0 ) nStyle = DOUBLE; @@ -265,7 +269,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa size_t const len = SAL_N_ELEMENTS(aDoubleStyles); long nWidth = 0; - SvxBorderStyle nTestStyle(NO_STYLE); + SvxBorderStyle nTestStyle(NONE); for (size_t i = 0; i < len && nWidth == 0; ++i) { nTestStyle = aDoubleStyles[i]; @@ -277,13 +281,13 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa if ( nWidth > 0 ) { nStyle = nTestStyle; - SetSvxBorderStyle(nStyle); + SetBorderLineStyle(nStyle); m_nWidth = nWidth; } else { // fdo#38542: not a known double, default to something custom... - SetSvxBorderStyle(nStyle); + SetBorderLineStyle(nStyle); m_nWidth = nOut + nIn + nDist; if (nOut + nIn + nDist) { @@ -297,7 +301,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa } else { - SetSvxBorderStyle(nStyle); + SetBorderLineStyle(nStyle); if (nOut == 0 && nIn > 0) { // If only inner width is given swap inner and outer widths for @@ -347,14 +351,14 @@ sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const ( m_nWidth == rCmp.m_nWidth ) && ( m_bMirrorWidths == rCmp.m_bMirrorWidths ) && ( m_aWidthImpl == rCmp.m_aWidthImpl ) && - ( m_nStyle == rCmp.GetSvxBorderStyle()) && + ( 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::SetSvxBorderStyle( SvxBorderStyle nNew ) +void SvxBorderLine::SetBorderLineStyle( SvxBorderStyle nNew ) { m_nStyle = nNew; m_aWidthImpl = getWidthImpl( m_nStyle ); |