rename SvxBorderLine::SetStyle to something unambiguous

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

5 files changed, 36 insertions, 34 deletions

diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index 92f9960ef79b..0c3bdcbad6a3 100644
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -139,14 +139,14 @@ namespace editeng {
         sal_uInt16      GetInWidth() const;
         sal_uInt16      GetDistance() const;
 
-        SvxBorderStyle  GetStyle() const { return m_nStyle; }
+        SvxBorderStyle  GetSvxBorderStyle() const { return m_nStyle; }
 
         void            SetColor( const Color &rColor ) { aColor = rColor; }
         void            SetColorOutFn( Color (*pColorOutFn)( Color ) ) { m_pColorOutFn = pColorOutFn; }
         void            SetColorInFn( Color (*pColorInFn)( Color ) ) { m_pColorInFn = pColorInFn; }
         void            SetColorGapFn( Color (*pColorGapFn)( Color ) ) { m_pColorGapFn = pColorGapFn; }
         void            SetUseLeftTop( bool bUseLeftTop ) { m_bUseLeftTop = bUseLeftTop; }
-        void            SetStyle( SvxBorderStyle nNew );
+        void            SetSvxBorderStyle( SvxBorderStyle nNew );
         void            ScaleMetrics( long nMult, long nDiv );
 
         sal_Bool            operator==( const SvxBorderLine &rCmp ) const;
diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx
index 4b32ec6f65b4..69adb1048162 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -96,7 +96,7 @@ void BorderLineTest::testGuessWidthDouble()
     // Normal double case
     SvxBorderLine line;
     line.GuessLinesWidths( DOUBLE, TEST_WIDTH, TEST_WIDTH, TEST_WIDTH );
-    CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetSvxBorderStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
@@ -105,7 +105,7 @@ void BorderLineTest::testGuessWidthNoMatch()
     SvxBorderLine line;
     line.GuessLinesWidths( DOUBLE,
             TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 );
-    CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetSvxBorderStyle() );
     CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() );
 }
 
@@ -116,7 +116,7 @@ void BorderLineTest::testGuessWidthThinthickSmallgap()
             THINTHICKSG_OUT_WIDTH,
             THINTHICKSG_IN_WIDTH,
             THINTHICKSG_DIST_WIDTH );
-    CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetSvxBorderStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
@@ -127,7 +127,7 @@ void BorderLineTest::testGuessWidthThinthickLargegap()
             THINTHICKLG_OUT_WIDTH,
             THINTHICKLG_IN_WIDTH,
             THINTHICKLG_DIST_WIDTH );
-    CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetSvxBorderStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
@@ -138,7 +138,7 @@ void BorderLineTest::testGuessWidthNostyleDouble()
             THINTHICKLG_OUT_WIDTH,
             THINTHICKLG_IN_WIDTH,
             THINTHICKLG_DIST_WIDTH );
-    CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetSvxBorderStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
@@ -146,7 +146,7 @@ void BorderLineTest::testGuessWidthNostyleSingle()
 {
     SvxBorderLine line;
     line.GuessLinesWidths( NO_STYLE, TEST_WIDTH );
-    CPPUNIT_ASSERT_EQUAL( SOLID, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( SOLID, line.GetSvxBorderStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 167714189a8a..b344ee120fcf 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -277,13 +277,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)
             {
@@ -297,7 +297,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
@@ -347,14 +347,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 bfdf178574a1..6d087e2d5417 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -145,7 +145,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;
     }
@@ -1696,7 +1696,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
@@ -1784,14 +1784,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);
         }
@@ -1859,7 +1859,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 )
@@ -2010,7 +2010,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;
             }
@@ -3275,7 +3275,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;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index e63b5e2ff6f7..fc02868e764d 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1468,49 +1468,49 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
             }
 
         case RTF_BRDRDOT:       // dotted border
-            aBrd.SetStyle( DOTTED );
+            aBrd.SetSvxBorderStyle( DOTTED );
             break;
         case RTF_BRDRDASH:      // dashed border
-            aBrd.SetStyle( DASHED );
+            aBrd.SetSvxBorderStyle( DASHED );
             break;
         case RTF_BRDRHAIR:      // hairline border
             {
-                aBrd.SetStyle( SOLID );
+                aBrd.SetSvxBorderStyle( SOLID );
                 aBrd.SetWidth( DEF_LINE_WIDTH_0 );
             }
             break;
         case RTF_BRDRDB:        // Double border
-            aBrd.SetStyle( DOUBLE );
+            aBrd.SetSvxBorderStyle( DOUBLE );
             break;
         case RTF_BRDRINSET:     // inset border
-            aBrd.SetStyle( INSET );
+            aBrd.SetSvxBorderStyle( INSET );
             break;
         case RTF_BRDROUTSET:    // outset border
-            aBrd.SetStyle( OUTSET );
+            aBrd.SetSvxBorderStyle( OUTSET );
             break;
         case RTF_BRDRTNTHSG:    // ThinThick Small gap
-            aBrd.SetStyle( THINTHICK_SMALLGAP );
+            aBrd.SetSvxBorderStyle( THINTHICK_SMALLGAP );
             break;
         case RTF_BRDRTNTHMG:    // ThinThick Medium gap
-            aBrd.SetStyle( THINTHICK_MEDIUMGAP );
+            aBrd.SetSvxBorderStyle( THINTHICK_MEDIUMGAP );
             break;
         case RTF_BRDRTNTHLG:    // ThinThick Large gap
-            aBrd.SetStyle( THINTHICK_LARGEGAP );
+            aBrd.SetSvxBorderStyle( THINTHICK_LARGEGAP );
             break;
         case RTF_BRDRTHTNSG:    // ThickThin Small gap
-            aBrd.SetStyle( THICKTHIN_SMALLGAP );
+            aBrd.SetSvxBorderStyle( THICKTHIN_SMALLGAP );
             break;
         case RTF_BRDRTHTNMG:    // ThickThin Medium gap
-            aBrd.SetStyle( THICKTHIN_MEDIUMGAP );
+            aBrd.SetSvxBorderStyle( THICKTHIN_MEDIUMGAP );
             break;
         case RTF_BRDRTHTNLG:    // ThickThin Large gap
-            aBrd.SetStyle( THICKTHIN_LARGEGAP );
+            aBrd.SetSvxBorderStyle( THICKTHIN_LARGEGAP );
             break;
         case RTF_BRDREMBOSS:    // Embossed border
-            aBrd.SetStyle( EMBOSSED );
+            aBrd.SetSvxBorderStyle( EMBOSSED );
             break;
         case RTF_BRDRENGRAVE:   // Engraved border
-            aBrd.SetStyle( ENGRAVED );
+            aBrd.SetSvxBorderStyle( ENGRAVED );
             break;
 
         case RTF_BRDRS:         // single thickness border