rename SvxBorderLine::SetStyle to something unambiguous

Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae

9 files changed, 19 insertions, 17 deletions

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 7b6fd25dbcf1..f621c8322ca9 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -581,7 +581,7 @@ void ScFiltersTest::testBorderODS()
     CPPUNIT_ASSERT(!pTop);
     CPPUNIT_ASSERT(!pBottom);
     CPPUNIT_ASSERT(pRight);
-    CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID);
+    CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID);
 
     pDoc->GetBorderLines( 2, 1, 0, &pLeft, &pTop, &pRight, &pBottom );
     CPPUNIT_ASSERT(!pLeft);
@@ -589,7 +589,7 @@ void ScFiltersTest::testBorderODS()
     CPPUNIT_ASSERT(!pBottom);
 
     CPPUNIT_ASSERT(pRight);
-    CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID);
+    CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID);
     CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),20L);
 
     pDoc->GetBorderLines( 2, 8, 0, &pLeft, &pTop, &pRight, &pBottom );
@@ -598,7 +598,7 @@ void ScFiltersTest::testBorderODS()
     CPPUNIT_ASSERT(pTop);
     CPPUNIT_ASSERT(pBottom);
     CPPUNIT_ASSERT(pRight);
-    CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID);
+    CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID);
     CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),5L);
     CPPUNIT_ASSERT(pRight->GetColor() == Color(COL_BLUE));
 
@@ -620,17 +620,17 @@ void ScFiltersTest::testBorderXLS()
 
     pDoc->GetBorderLines( 2, 3, 0, &pLeft, &pTop, &pRight, &pBottom );
     CPPUNIT_ASSERT(pRight);
-    CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID);
+    CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID);
     CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),6L);
 
     pDoc->GetBorderLines( 3, 5, 0, &pLeft, &pTop, &pRight, &pBottom );
     CPPUNIT_ASSERT(pRight);
-    CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID);
+    CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID);
     CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),18L);
 
     pDoc->GetBorderLines( 5, 7, 0, &pLeft, &pTop, &pRight, &pBottom );
     CPPUNIT_ASSERT(pRight);
-    CPPUNIT_ASSERT_EQUAL(pRight->GetStyle(),editeng::SOLID);
+    CPPUNIT_ASSERT_EQUAL(pRight->GetSvxBorderStyle(),editeng::SOLID);
     CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),24L);
 }
 
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 3c333f940721..6dd3547d2155 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -570,7 +570,7 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet*
     if ((dest))                                        \
     {                                                  \
         SvxBorderLine* pCast = (SvxBorderLine*)(dest); \
-        pCast->SetStyle( (src)->GetStyle( ) );         \
+        pCast->SetSvxBorderStyle( (src)->GetSvxBorderStyle() ); \
         pCast->SetWidth( (src)->GetWidth( ) );         \
     }
 
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 74ba92ac8ede..881b2b25af3f 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1571,13 +1571,13 @@ void lclGetBorderLine(
         else if( nOuterWidth >= EXC_BORDER_MEDIUM )
         {
             rnXclLine = EXC_LINE_MEDIUM;
-            if ( pLine->GetStyle( ) == ::editeng::DASHED )
+            if (pLine->GetSvxBorderStyle( ) == ::editeng::DASHED)
                 rnXclLine = EXC_LINE_MEDIUMDASHED;
         }
         else if( nOuterWidth >= EXC_BORDER_THIN )
         {
             rnXclLine = EXC_LINE_THIN;
-            switch ( pLine->GetStyle( ) )
+            switch (pLine->GetSvxBorderStyle())
             {
                 case ::editeng::DASHED:
                     rnXclLine = EXC_LINE_DASHED;
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 83b54c80b1d9..7c146cbc088b 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -919,7 +919,8 @@ bool lclConvertBorderLine( ::editeng::SvxBorderLine& rLine, const XclImpPalette&
 
     rLine.SetColor( rPalette.GetColor( nXclColor ) );
     rLine.SetWidth( ppnLineParam[ nXclLine ][ 0 ] );
-    rLine.SetStyle( (::editeng::SvxBorderStyle)ppnLineParam[ nXclLine ][ 1 ] );
+    rLine.SetSvxBorderStyle( static_cast< ::editeng::SvxBorderStyle>(
+                ppnLineParam[ nXclLine ][ 1 ]) );
     return true;
 }
 
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index d57a6d004076..e4bbe2581eeb 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -520,7 +520,7 @@ rtl::OString ScHTMLExport::BorderToStyle(const char* pBorderName,
             std::max(int(nWidth / TWIPS_PER_PIXEL), 1) : 0;
         aOut.append(static_cast<sal_Int32>(nPxWidth)).
             append(RTL_CONSTASCII_STRINGPARAM("px "));
-        switch ( pLine->GetStyle() )
+        switch (pLine->GetSvxBorderStyle())
         {
             case ::editeng::SOLID:
                 aOut.append(RTL_CONSTASCII_STRINGPARAM("solid"));
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index eefad8a52640..2d53cd4bb481 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -168,12 +168,12 @@ void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLin
     switch ( nLine )
     {
         default:
-        case 0: aBL.SetStyle( ::editeng::NO_STYLE ); break;
+        case 0: aBL.SetSvxBorderStyle( ::editeng::NO_STYLE ); break;
         case 1: aBL.SetWidth( DEF_LINE_WIDTH_1 ); break;
         case 2: aBL.SetWidth( DEF_LINE_WIDTH_2 ); break;
         case 3:
         {
-            aBL.SetStyle( ::editeng::DOUBLE );
+            aBL.SetSvxBorderStyle( ::editeng::DOUBLE );
             aBL.SetWidth( DEF_LINE_WIDTH_1 );
         }
         break;
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index bcd140e1eddf..6d3e5ec79aae 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1509,7 +1509,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 
                         if ( pDefLine )
                         {
-                            pDefLine->SetStyle( pLine->GetStyle( ) );
+                            pDefLine->SetSvxBorderStyle(
+                                    pLine->GetSvxBorderStyle());
                             pDefLine->SetWidth( pLine->GetWidth( ) );
                             pTabViewShell->SetSelectionFrameLines( pDefLine, false );
                         }
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index f5639a2f5b22..0015f9dfdd2a 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -42,7 +42,7 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine
         delete pCurFrameLine;
         pCurFrameLine = new ::editeng::SvxBorderLine( &pLine->GetColor(),
                                             pLine->GetWidth(),
-                                            pLine->GetStyle() );
+                                            pLine->GetSvxBorderStyle() );
     }
     else if ( pCurFrameLine )
     {
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 9b3efb6e8e08..f1c8f189067c 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2927,13 +2927,13 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine&       rLine,
         if ( bColor )
         {
             rLine.SetColor      ( pSrcLine->GetColor() );
-            rLine.SetStyle      ( pDestLine->GetStyle() );
+            rLine.SetSvxBorderStyle(pDestLine->GetSvxBorderStyle());
             rLine.SetWidth      ( pDestLine->GetWidth() );
         }
         else
         {
             rLine.SetColor      ( pDestLine->GetColor() );
-            rLine.SetStyle      ( pSrcLine->GetStyle() );
+            rLine.SetSvxBorderStyle(pSrcLine->GetSvxBorderStyle());
             rLine.SetWidth      ( pSrcLine->GetWidth() );
         }
     }