rename SvxBorderLine::SetStyle to something unambiguous

Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae
(cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)

4 files changed, 18 insertions, 16 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 9e45ebfa40c0..98727ad66a63 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3583,7 +3583,7 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
 
     // Linien-Stil: solid oder double
     sOut.append(' ');
-    switch ( pLine->GetStyle( ) )
+    switch (pLine->GetSvxBorderStyle())
     {
         case ::editeng::SOLID:
             sOut.append(sCSS1_PV_solid);
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 583b167a05b2..53529f67385c 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1025,7 +1025,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
     }
 
     if ( pOptions->nCellSpacing != 0 )
-        aTopBorderLine.SetStyle( ::editeng::DOUBLE );
+        aTopBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
     aTopBorderLine.SetWidth( nPHeight );
     aTopBorderLine.SetColor( rBorderColor );
     aBottomBorderLine = aTopBorderLine;
@@ -1037,7 +1037,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
     else
     {
         if ( pOptions->nCellSpacing != 0 )
-            aLeftBorderLine.SetStyle( ::editeng::DOUBLE );
+            aLeftBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
         aLeftBorderLine.SetWidth( nPWidth );
         aLeftBorderLine.SetColor( rBorderColor );
     }
@@ -1045,7 +1045,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
 
     if( pOptions->nCellSpacing != 0 )
     {
-        aBorderLine.SetStyle( ::editeng::DOUBLE );
+        aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
         aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
     }
     else
@@ -1487,7 +1487,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
 
                     sal_uInt16 nBorderWidth = aBorderLine.GetOutWidth();
                     nBorderWidth *= (nEmptyRows + 1);
-                    aThickBorderLine.SetStyle( ::editeng::SOLID );
+                    aThickBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
                     aThickBorderLine.SetWidth( nBorderWidth );
                     aBoxItem.SetLine( &aThickBorderLine, BOX_LINE_BOTTOM );
                 }
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 22dcd941d71b..90f66e795469 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -323,31 +323,31 @@ void SvxCSS1BorderInfo::SetBorderLine( sal_uInt16 nLine, SvxBoxItem &rBoxItem )
     switch ( eStyle )
     {
         case CSS1_BS_SINGLE:
-            aBorderLine.SetStyle( ::editeng::SOLID );
+            aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
             break;
         case CSS1_BS_DOUBLE:
-            aBorderLine.SetStyle( ::editeng::DOUBLE );
+            aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
             break;
         case CSS1_BS_DOTTED:
-            aBorderLine.SetStyle( ::editeng::DOTTED );
+            aBorderLine.SetSvxBorderStyle( ::editeng::DOTTED );
             break;
         case CSS1_BS_DASHED:
-            aBorderLine.SetStyle( ::editeng::DASHED );
+            aBorderLine.SetSvxBorderStyle( ::editeng::DASHED );
             break;
         case CSS1_BS_GROOVE:
-            aBorderLine.SetStyle( ::editeng::ENGRAVED );
+            aBorderLine.SetSvxBorderStyle( ::editeng::ENGRAVED );
             break;
         case CSS1_BS_RIDGE:
-            aBorderLine.SetStyle( ::editeng::EMBOSSED );
+            aBorderLine.SetSvxBorderStyle( ::editeng::EMBOSSED );
             break;
         case CSS1_BS_INSET:
-            aBorderLine.SetStyle( ::editeng::INSET );
+            aBorderLine.SetSvxBorderStyle( ::editeng::INSET );
             break;
         case CSS1_BS_OUTSET:
-            aBorderLine.SetStyle( ::editeng::OUTSET );
+            aBorderLine.SetSvxBorderStyle( ::editeng::OUTSET );
             break;
         default:
-            aBorderLine.SetStyle( ::editeng::NO_STYLE );
+            aBorderLine.SetSvxBorderStyle( ::editeng::NO_STYLE );
             break;
     }
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 703cef0be78d..a3d4ae502266 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5245,7 +5245,9 @@ void SwHTMLParser::InsertHorzRule()
             long nPHeight = (long)nSize;
             SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
             if ( !bNoShade )
-                aBorderLine.SetStyle( ::editeng::DOUBLE );
+            {
+                aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
+            }
             aBorderLine.SetWidth( nPHeight );
         }
         else if( bNoShade )
@@ -5254,7 +5256,7 @@ void SwHTMLParser::InsertHorzRule()
         }
         else
         {
-            aBorderLine.SetStyle( ::editeng::DOUBLE );
+            aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
             aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
         }