rename SvxBorderLine::SetStyle to something unambiguous

Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae

2 files changed, 14 insertions, 12 deletions

diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index fcfde00b902a..bd19eaed93b1 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -274,13 +274,13 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa
         if ( nWidth > 0 )
         {
             nStyle = nTestStyle;
-            SetStyle( nStyle );
+            SetSvxBorderStyle(nStyle);
             m_nWidth = nWidth;
         }
         else
         {
             // fdo#38542: not a known double, default to something custom...
-            SetStyle( nStyle );
+            SetSvxBorderStyle(nStyle);
             m_nWidth = nOut + nIn + nDist;
             if (nOut + nIn + nDist)
             {
@@ -294,7 +294,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sa
     }
     else
     {
-        SetStyle( nStyle );
+        SetSvxBorderStyle(nStyle);
         if (nOut == 0 && nIn > 0)
         {
             // If only inner width is given swap inner and outer widths for
@@ -344,14 +344,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.GetStyle() )         &&
+             ( m_nStyle == rCmp.GetSvxBorderStyle()) &&
              ( m_bUseLeftTop == rCmp.m_bUseLeftTop ) &&
              ( m_pColorOutFn == rCmp.m_pColorOutFn ) &&
              ( m_pColorInFn == rCmp.m_pColorInFn )   &&
              ( m_pColorGapFn == rCmp.m_pColorGapFn ) );
 }
 
-void SvxBorderLine::SetStyle( SvxBorderStyle nNew )
+void SvxBorderLine::SetSvxBorderStyle( SvxBorderStyle nNew )
 {
     m_nStyle = nNew;
     m_aWidthImpl = getWidthImpl( m_nStyle );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 1ceebf52e074..c080460ca9a1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -143,7 +143,7 @@ namespace
                << l.GetDistance();
 
         if (version >= BORDER_LINE_WITH_STYLE_VERSION)
-               stream << static_cast<sal_uInt16>(l.GetStyle());
+               stream << static_cast<sal_uInt16>(l.GetSvxBorderStyle());
 
         return stream;
     }
@@ -1694,7 +1694,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Boo
         aLine.InnerLineWidth = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetInWidth() ): pLine->GetInWidth() );
         aLine.OuterLineWidth = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetOutWidth()): pLine->GetOutWidth() );
         aLine.LineDistance   = sal_uInt16( bConvert ? TWIP_TO_MM100_UNSIGNED(pLine->GetDistance()): pLine->GetDistance() );
-        aLine.LineStyle      = pLine->GetStyle( );
+        aLine.LineStyle      = pLine->GetSvxBorderStyle();
         aLine.LineWidth      = sal_uInt32( bConvert ? TWIP_TO_MM100( pLine->GetWidth( ) ) : pLine->GetWidth( ) );
     }
     else
@@ -1782,14 +1782,14 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B
     rSvxLine.SetColor(   Color(rLine.Color));
     if ( bGuessWidth )
     {
-        rSvxLine.GuessLinesWidths( rSvxLine.GetStyle(),
+        rSvxLine.GuessLinesWidths( rSvxLine.GetSvxBorderStyle(),
                 sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.OuterLineWidth) : rLine.OuterLineWidth  ),
                 sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth  ),
                 sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance )  : rLine.LineDistance  ));
     }
     else
     {
-        if (DOUBLE == rSvxLine.GetStyle())
+        if (DOUBLE == rSvxLine.GetSvxBorderStyle())
         {   // fdo#46112: divide width by 3 for outer line, gap, inner line
            rSvxLine.ScaleMetrics(1, 3);
         }
@@ -1857,7 +1857,7 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx
             nStyle = INSET;
             break;
     }
-    rSvxLine.SetStyle( nStyle );
+    rSvxLine.SetSvxBorderStyle( nStyle );
 
     sal_Bool bGuessWidth = sal_True;
     if ( rLine.LineWidth )
@@ -2008,7 +2008,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
                 {
                     editeng::SvxBorderLine* pLine = const_cast< editeng::SvxBorderLine* >( GetLine( aBorders[n] ) );
                     if( pLine )
-                        pLine->SetStyle( eBorderStyle );
+                        pLine->SetSvxBorderStyle( eBorderStyle );
                 }
                 return sal_True;
             }
@@ -3273,7 +3273,9 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
         switch ( nMemId )
         {
             case MID_FG_COLOR:      pLine->SetColor( Color(nVal) ); break;
-            case MID_LINE_STYLE:    pLine->SetStyle((SvxBorderStyle)nVal); break;
+            case MID_LINE_STYLE:
+                pLine->SetSvxBorderStyle(static_cast<SvxBorderStyle>(nVal));
+            break;
             default:
                 OSL_FAIL( "Wrong MemberId" );
                 return sal_False;