rename SvxBorderLine::SetStyle to something unambiguous

Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae

18 files changed, 46 insertions, 42 deletions

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c5dacc13a38b..d4a1c1220377 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -128,7 +128,7 @@ void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
     SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
     if ( bHTML )
     {
-        aLine.SetStyle( editeng::DOUBLE );
+        aLine.SetSvxBorderStyle( editeng::DOUBLE );
         aLine.SetWidth( DEF_LINE_WIDTH_0 );
     }
     SvxBoxItem aBox(RES_BOX); aBox.SetDistance( 55 );
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 667fed3d21bd..7040153b38e1 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -592,27 +592,27 @@ sal_Bool SwAutoFormat::DoUnderline()
         switch( eState )
         {
         case 1:         // einfach, 0,05 pt
-            aLine.SetStyle( editeng::SOLID );
+            aLine.SetSvxBorderStyle( editeng::SOLID );
             aLine.SetWidth( DEF_LINE_WIDTH_0 );
             break;
         case 2:         // einfach, 1,0 pt
-            aLine.SetStyle( editeng::SOLID );
+            aLine.SetSvxBorderStyle( editeng::SOLID );
             aLine.SetWidth( DEF_LINE_WIDTH_1 );
             break;
         case 3:         // doppelt, 1,1 pt
-            aLine.SetStyle( editeng::DOUBLE );
+            aLine.SetSvxBorderStyle( editeng::DOUBLE );
             aLine.SetWidth( DEF_LINE_WIDTH_0 );
             break;
         case 4:         // doppelt, 4,5 pt
-            aLine.SetStyle( editeng::THICKTHIN_SMALLGAP );
+            aLine.SetSvxBorderStyle( editeng::THICKTHIN_SMALLGAP );
             aLine.SetWidth( DEF_LINE_WIDTH_1  );
             break;
         case 5:         // doppelt, 6,0 pt
-            aLine.SetStyle( editeng::THINTHICK_SMALLGAP );
+            aLine.SetSvxBorderStyle( editeng::THINTHICK_SMALLGAP );
             aLine.SetWidth( DEF_LINE_WIDTH_2 );
             break;
         case 6:         // doppelt, 9,0 pt
-            aLine.SetStyle( editeng::DOUBLE );
+            aLine.SetSvxBorderStyle( editeng::DOUBLE );
             aLine.SetWidth( DEF_LINE_WIDTH_2 );
             break;
         }
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2520bc94b723..c6d4e62c5f6e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4623,7 +4623,7 @@ lcl_MakeBorderLine(SwRect const& rRect,
             nExtentRightStart, nExtentRightEnd,
             aLeftColor.getBColor(), aRightColor.getBColor(),
             rBorder.GetColorGap().getBColor(), rBorder.HasGapColor(),
-            rBorder.GetStyle() );
+            rBorder.GetSvxBorderStyle() );
     g_pBorderLines->AddBorderLine(xLine);
 }
 
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index bc8441701a76..e9a30e75be0c 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3581,7 +3581,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 04ffd12434f9..2817f8132fcb 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 158483465f0b..d80b54b555d4 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -321,31 +321,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 a21d97616808..1f9774501a3a 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5244,7 +5244,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 )
@@ -5253,7 +5255,7 @@ void SwHTMLParser::InsertHorzRule()
         }
         else
         {
-            aBorderLine.SetStyle( ::editeng::DOUBLE );
+            aBorderLine.SetSvxBorderStyle( ::editeng::DOUBLE );
             aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
         }
 
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index a2d451f91d5b..6c7bd759ac0d 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -228,13 +228,13 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc
                 break;
         }
         pLine->SetWidth( nCode );
-        pLine->SetStyle( eStyle );
+        pLine->SetSvxBorderStyle( eStyle );
     }
     else
     {
         if ( pBrc->dxpLine1WidthGet() == 1 && pBrc->dxpLine2WidthGet() == 1 )
         {
-            pLine->SetStyle( ::editeng::DOUBLE );
+            pLine->SetSvxBorderStyle( ::editeng::DOUBLE );
             pLine->SetWidth( DEF_LINE_WIDTH_0 );
         }
         else
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index ba345a2cc959..42b003705411 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1354,7 +1354,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
     const char* pVal = "none";
     if ( !pBorderLine->isEmpty( ) )
     {
-        switch ( pBorderLine->GetStyle( ) )
+        switch (pBorderLine->GetSvxBorderStyle())
         {
             case ::editeng::SOLID:
                 pVal = ( sal_Char* )"single";
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 061449222226..5b6ea0612ff3 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -124,7 +124,7 @@ static OString OutTBLBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
     {
         aRet.append(pStr);
         // single line
-        switch ( pLine->GetStyle( ) )
+        switch (pLine->GetSvxBorderStyle())
         {
             case ::editeng::SOLID:
                 {
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 3631db88f57b..4638abae4f9a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1727,7 +1727,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt,
                         DrawModelToEmu( nLineWidth ));
 
                     MSO_LineDashing eDashing = mso_lineSolid;
-                    switch ( pLine->GetStyle( ) )
+                    switch (pLine->GetSvxBorderStyle())
                     {
                         case  ::editeng::DASHED:
                             eDashing = mso_lineDashGEL;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index bd24598b87f9..09c5592af9f8 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4074,7 +4074,7 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
             {
                 // All the border types values are available on
                 // http://msdn.microsoft.com/en-us/library/dd908142%28v=office.12%29.aspx
-                switch ( rLine.GetStyle( ) )
+                switch (rLine.GetSvxBorderStyle())
                 {
                     case ::editeng::SOLID:
                         {
@@ -4146,9 +4146,9 @@ WW8_BRC WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
             nWidth = ( nWidth + 7 ) / 15;
             if( nWidth > 5 )
                 nWidth = 5;
-            if ( ::editeng::DOTTED == rLine.GetStyle( ) )
+            if ( ::editeng::DOTTED == rLine.GetSvxBorderStyle() )
                 nWidth = 6;
-            else if ( ::editeng::DASHED == rLine.GetStyle( ) )
+            else if ( ::editeng::DASHED == rLine.GetSvxBorderStyle() )
                 nWidth = 7;
         }
 
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 084fc1519e63..2f3c47fcf8b5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1569,7 +1569,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
         aLine.SetColor( rLineColor );
 
         aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is already in twips
-        aLine.SetStyle( nIdx );
+        aLine.SetSvxBorderStyle(nIdx);
         if (editeng::DOUBLE == nIdx)
         {  // fdo#43249: divide width by 3 for outer line, gap, inner line
            aLine.ScaleMetrics(1, 3);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9df457c02b0d..656d4ae51c19 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1354,7 +1354,7 @@ void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace, sal_uInt
     }
 
     ::editeng::SvxBorderLine aLine;
-    aLine.SetStyle( eStyle );
+    aLine.SetSvxBorderStyle( eStyle );
     aLine.SetWidth( nLineThickness );
 
     //No AUTO for borders as yet, so if AUTO, use BLACK
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 72f711d03c69..3114bd48f8bf 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -365,7 +365,7 @@ void SvXMLExportItemMapper::handleElementItem(
 bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine )
 {
     bool bIsOdfDouble = false;
-    switch ( pLine->GetStyle() )
+    switch (pLine->GetSvxBorderStyle())
     {
         case ::editeng::DOUBLE:
         case ::editeng::THINTHICK_SMALLGAP:
@@ -743,7 +743,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
 
                         enum XMLTokenEnum eStyle = XML_SOLID;
                         bool bNoBorder = false;
-                        switch ( pLine->GetStyle( ) )
+                        switch (pLine->GetSvxBorderStyle())
                         {
                             case ::editeng::SOLID:
                                 eStyle = XML_SOLID;
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 8de48aba9a11..4531995dd8ee 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -157,7 +157,7 @@ void lcl_frmitems_setXMLBorderStyle( SvxBorderLine& rLine, sal_uInt16 nStyle )
     ::editeng::SvxBorderStyle eStyle = ::editeng::NO_STYLE;
     if ( nStyle != API_LINE_NONE )
         eStyle = ::editeng::SvxBorderStyle( nStyle );
-    rLine.SetStyle( eStyle );
+    rLine.SetSvxBorderStyle(eStyle);
 }
 
 sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
@@ -206,7 +206,9 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
            if (bHasWidth && USHRT_MAX != nNamedWidth)
            {
                if (bDouble)
-                   rpLine->SetStyle( ::editeng::DOUBLE );
+               {
+                   rpLine->SetSvxBorderStyle( ::editeng::DOUBLE );
+               }
                rpLine->SetWidth( aBorderWidths[nNamedWidth] );
            }
            else
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 909f17e43fb3..d4e7b1301466 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -942,7 +942,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
 
                     if(aBorderLine.GetOutWidth() == 0)
                     {
-                        aBorderLine.SetStyle( ::editeng::SOLID );
+                        aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
                         aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
                     }
                     //Distance nur setzen, wenn der Request vom Controller kommt
@@ -1076,7 +1076,7 @@ void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBo
     if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
         rBorderLine.SetWidth(pBorderLine->GetWidth());
 
-    rBorderLine.SetStyle(pBorderLine->GetStyle());
+    rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle());
     rBorderLine.SetColor(pBorderLine->GetColor());
 }
 
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 947f9ea03cbf..2e14c57d991c 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -453,7 +453,7 @@ static void lcl_TabGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLi
     if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
         rBorderLine.SetWidth(pBorderLine->GetWidth());
 
-    rBorderLine.SetStyle(pBorderLine->GetStyle());
+    rBorderLine.SetSvxBorderStyle(pBorderLine->GetSvxBorderStyle());
     rBorderLine.SetColor(pBorderLine->GetColor());
 }
 
@@ -531,7 +531,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
 
             if(aBorderLine.GetOutWidth() == 0)
             {
-                aBorderLine.SetStyle( ::editeng::SOLID );
+                aBorderLine.SetSvxBorderStyle( ::editeng::SOLID );
                 aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
             }