Switching the order of the SetLinesWidth arguments

6 files changed, 77 insertions, 86 deletions

diff --git a/editeng/inc/editeng/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index d7f6e0b648..ed9f29277c 100755
--- a/editeng/inc/editeng/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -175,7 +175,7 @@ public:
         \param nOut the width of the outer line in 1th pt
         \param nDist the width of the gap between the lines in 1th pt
      */
-    void            SetLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nIn, sal_uInt16 nOut, sal_uInt16 nDist );
+    void            GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sal_uInt16 nIn = 0, sal_uInt16 nDist = 0 );
 
     // TODO Hacky method to mirror lines in only a few cases
     void            SetMirrorWidths( bool bMirror = true ) { m_bMirrorWidths = bMirror; }
diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx
index 22e76b8488..e7ea1a1dee 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -52,12 +52,16 @@ class BorderLineTest : public CppUnit::TestFixture
         void testGuessWidthNoMatch();
         void testGuessWidthThinthickSmallgap();
         void testGuessWidthThinthickLargegap();
+        void testGuessWidthNostyleDouble();
+        void testGuessWidthNostyleSingle();
 
     CPPUNIT_TEST_SUITE(BorderLineTest);
     CPPUNIT_TEST(testGuessWidthDouble);
     CPPUNIT_TEST(testGuessWidthNoMatch);
     CPPUNIT_TEST(testGuessWidthThinthickSmallgap);
     CPPUNIT_TEST(testGuessWidthThinthickLargegap);
+    CPPUNIT_TEST(testGuessWidthNostyleDouble);
+    CPPUNIT_TEST(testGuessWidthNostyleSingle);
     CPPUNIT_TEST_SUITE_END();
 };
 
@@ -67,7 +71,7 @@ void BorderLineTest::testGuessWidthDouble()
 {
     // Normal double case
     SvxBorderLine line;
-    line.SetLinesWidths( DOUBLE, TEST_WIDTH, TEST_WIDTH, TEST_WIDTH );
+    line.GuessLinesWidths( DOUBLE, TEST_WIDTH, TEST_WIDTH, TEST_WIDTH );
     CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
@@ -75,7 +79,7 @@ void BorderLineTest::testGuessWidthDouble()
 void BorderLineTest::testGuessWidthNoMatch()
 {
     SvxBorderLine line;
-    line.SetLinesWidths( DOUBLE,
+    line.GuessLinesWidths( DOUBLE,
             1, 2, 3 );
     CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() );
     CPPUNIT_ASSERT_EQUAL( long( 0 ), line.GetWidth() );
@@ -84,9 +88,9 @@ void BorderLineTest::testGuessWidthNoMatch()
 void BorderLineTest::testGuessWidthThinthickSmallgap()
 {
     SvxBorderLine line;
-    line.SetLinesWidths( DOUBLE,
-            THINTHICKSG_IN_WIDTH,
+    line.GuessLinesWidths( DOUBLE,
             THINTHICKSG_OUT_WIDTH,
+            THINTHICKSG_IN_WIDTH,
             THINTHICKSG_DIST_WIDTH );
     CPPUNIT_ASSERT_EQUAL( THINTHICK_SMALLGAP, line.GetStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
@@ -95,14 +99,33 @@ void BorderLineTest::testGuessWidthThinthickSmallgap()
 void BorderLineTest::testGuessWidthThinthickLargegap()
 {
     SvxBorderLine line;
-    line.SetLinesWidths( DOUBLE,
+    line.GuessLinesWidths( DOUBLE,
+            THINTHICKLG_OUT_WIDTH,
             THINTHICKLG_IN_WIDTH,
+            THINTHICKLG_DIST_WIDTH );
+    CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
+}
+
+void BorderLineTest::testGuessWidthNostyleDouble()
+{
+    SvxBorderLine line;
+    line.GuessLinesWidths( NO_STYLE,
             THINTHICKLG_OUT_WIDTH,
+            THINTHICKLG_IN_WIDTH,
             THINTHICKLG_DIST_WIDTH );
     CPPUNIT_ASSERT_EQUAL( THINTHICK_LARGEGAP, line.GetStyle() );
     CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
 }
 
+void BorderLineTest::testGuessWidthNostyleSingle()
+{
+    SvxBorderLine line;
+    line.GuessLinesWidths( NO_STYLE, TEST_WIDTH );
+    CPPUNIT_ASSERT_EQUAL( SOLID, line.GetStyle() );
+    CPPUNIT_ASSERT_EQUAL( TEST_WIDTH, line.GetWidth() );
+}
+
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 87a21ba901..0e25bba482 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -99,6 +99,7 @@ SvxBorderLine::SvxBorderLine( const Color *pCol, long nWidth,
        Color (*pColorOutFn)( Color ), Color (*pColorInFn)( Color ),
        Color (*pColorGapFn)( Color ) )
 : m_nWidth( nWidth )
+, m_bMirrorWidths( false )
 , m_aWidthImpl( SvxBorderLine::getWidthImpl( nStyle ) )
 , m_nMult( 1 )
 , m_nDiv( 1 )
@@ -216,7 +217,9 @@ SvxBorderLine::SvxBorderLine( const SvxBorderLine& r )
 SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
 {
     aColor = r.aColor;
+    m_nWidth = r.m_nWidth;
     m_aWidthImpl = r.m_aWidthImpl;
+    m_bMirrorWidths = r.m_bMirrorWidths;
     m_nStyle = r.m_nStyle;
     m_bUseLeftTop = r.m_bUseLeftTop;
     m_pColorOutFn = r.m_pColorOutFn;
@@ -233,8 +236,14 @@ void SvxBorderLine::ScaleMetrics( long nMult, long nDiv )
     m_nDiv = nDiv;
 }
 
-void SvxBorderLine::SetLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nIn, sal_uInt16 nOut, sal_uInt16 nDist )
+void SvxBorderLine::GuessLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nOut, sal_uInt16 nIn, sal_uInt16 nDist )
 {
+    if ( nStyle == NO_STYLE ) {
+        nStyle = SOLID;
+        if ( nOut > 0 && nIn > 0 )
+            nStyle = DOUBLE;
+    }
+
     if ( nStyle == DOUBLE )
     {
         static SvxBorderStyle aDoubleStyles[] =
@@ -276,17 +285,17 @@ void SvxBorderLine::SetLinesWidths( SvxBorderStyle nStyle, sal_uInt16 nIn, sal_u
 
 sal_uInt16 SvxBorderLine::GetOutWidth() const
 {
-    sal_uInt16 nOut = (sal_uInt16)Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv );
+    sal_uInt16 nOut = (sal_uInt16)Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv );
     if ( m_bMirrorWidths )
-        nOut = (sal_uInt16)Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv );
+        nOut = (sal_uInt16)Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv );
     return nOut;
 }
 
 sal_uInt16 SvxBorderLine::GetInWidth() const
 {
-    sal_uInt16 nIn = (sal_uInt16)Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv );
+    sal_uInt16 nIn = (sal_uInt16)Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv );
     if ( m_bMirrorWidths )
-        nIn = (sal_uInt16)Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv );
+        nIn = (sal_uInt16)Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv );
     return nIn;
 }
 
@@ -300,6 +309,8 @@ sal_uInt16 SvxBorderLine::GetDistance() const
 sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
 {
     return ( ( aColor    == rCmp.aColor )            &&
+             ( m_nWidth == rCmp.m_nWidth )           &&
+             ( m_bMirrorWidths  == rCmp.m_bMirrorWidths )  &&
              ( m_aWidthImpl  == rCmp.m_aWidthImpl )  &&
              ( m_nStyle == rCmp.GetStyle() )         &&
              ( m_bUseLeftTop == rCmp.m_bUseLeftTop ) &&
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 5d523f8762..ffb6c1b6fa 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1724,13 +1724,16 @@ namespace
 {
 
 sal_Bool
-lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert, sal_Bool bGuessWidth)
 {
     rSvxLine.SetColor(   Color(rLine.Color));
-    rSvxLine.SetLinesWidths( rSvxLine.GetStyle(),
-            sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth  ),
-            sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.OuterLineWidth) : rLine.OuterLineWidth  ),
-            sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance	)  : rLine.LineDistance	 ));
+    if ( bGuessWidth )
+    {
+        rSvxLine.GuessLinesWidths( rSvxLine.GetStyle(),
+                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	 ));
+    }
 
     sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0;
     return bRet;
@@ -1741,7 +1744,7 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B
 // -----------------------------------------------------------------------
 sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
 {
-    return lcl_lineToSvxLine(rLine, rSvxLine, bConvert);
+    return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, sal_True);
 }
 
 sal_Bool
@@ -1794,8 +1797,15 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx
             break;
     }
     rSvxLine.SetStyle( nStyle );
+    
+    sal_Bool bGuessWidth = true; 
+    if ( rLine->LineWidth )
+    {
+        rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine->LineWidth ) : rLine->LineWidth );
+        bGuessWidth = false;
+    }
 
-    return lcl_lineToSvxLine(rLine, rSvxLine, bConvert);
+    return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);
 }
 
 // -----------------------------------------------------------------------
@@ -2224,7 +2234,7 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
         Color aColor;
         rStrm >> aColor >> nOutline >> nInline >> _nDistance;
         SvxBorderLine aBorder( &aColor );
-        aBorder.SetLinesWidths( SOLID, nInline, nOutline, _nDistance );
+        aBorder.GuessLinesWidths( NO_STYLE, nOutline, nInline, _nDistance );
 
         pAttr->SetLine( &aBorder, aLineMap[cLine] );
     }
@@ -2598,7 +2608,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
         Color aColor;
         rStrm >> aColor >> nOutline >> nInline >> nDistance;
         SvxBorderLine aBorder( &aColor );
-        aBorder.SetLinesWidths( SOLID, nInline, nOutline, nDistance );
+        aBorder.GuessLinesWidths( NO_STYLE, nOutline, nInline, nDistance );
 
         switch( cLine )
         {
@@ -3204,7 +3214,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
     if( nOutline )
     {
         SvxBorderLine aLine( &aColor );
-        aLine.SetLinesWidths( SOLID, nInline, nOutline, nDistance );
+        aLine.GuessLinesWidths( NO_STYLE, nOutline, nInline, nDistance );
         _pLine->SetLine( &aLine );
     }
     return _pLine;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 057cd2ec7d..85ee6b9416 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1766,8 +1766,9 @@ SETBORDER:
                                 break;
                             }
                             nDistWidth = sal_uInt16( nTokenValue );
-                            aBrd.SetLinesWidths( SOLID, nInWidth,
-                                   nOutWidth, nDistWidth );
+
+                            aBrd.GuessLinesWidths( NO_STYLE, nOutWidth,
+                                   nInWidth, nDistWidth );
                             SetBorderLine( nBorderTyp, aAttr, aBrd );
                             break;
                         }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0924ce8d26..c37dff9a31 100755
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1163,7 +1163,7 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
     sal_uInt16 				nModifier = aFrameSet.GetModifier();
     sal_uInt8 				nValidFlags = 0;
 
-    theDefLine.SetLinesWidths( theDefLine.GetStyle(), 0, DEF_LINE_WIDTH_0, 0 );
+    theDefLine.GuessLinesWidths( theDefLine.GetStyle(), DEF_LINE_WIDTH_0 );
     switch ( nSel )
     {
         case 1: nValidFlags |= FRM_VALID_ALL;
@@ -1557,70 +1557,16 @@ void SvxLineWindow_Impl::MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Siz
 IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
 {
     SvxLineItem     aLineItem( SID_FRAME_LINESTYLE );
-    sal_uInt16			n1 = 0,
-                    n2 = 0,
-                    n3 = 0;
-    SvxBorderStyle  nStyle = SOLID;
-    sal_Bool			bSetLine = sal_True;
-
-    switch ( aLineSet.GetSelectItemId() )
-    {
-        case  1: n1 = DEF_LINE_WIDTH_0; break;
-        case  2: n1 = DEF_LINE_WIDTH_1; break;
-        case  3: n1 = DEF_LINE_WIDTH_2; break;
-        case  4: n1 = DEF_LINE_WIDTH_3; break;
-        case  5: n1 = DEF_LINE_WIDTH_4; break;
-
-        case  6: n1 = DEF_DOUBLE_LINE0_OUT;
-                 n2 = DEF_DOUBLE_LINE0_IN;
-                 n3 = DEF_DOUBLE_LINE0_DIST;	 break;
-        case  7: n1 = DEF_DOUBLE_LINE7_OUT;
-                 n2 = DEF_DOUBLE_LINE7_IN;
-                 n3 = DEF_DOUBLE_LINE7_DIST;	 break;
-        case  8: n1 = DEF_DOUBLE_LINE1_OUT;
-                 n2 = DEF_DOUBLE_LINE1_IN;
-                 n3 = DEF_DOUBLE_LINE1_DIST;	 break;
-        case  9: n1 = DEF_DOUBLE_LINE2_OUT;
-                 n2 = DEF_DOUBLE_LINE2_IN;
-                 n3 = DEF_DOUBLE_LINE2_DIST;	 break;
-        case 10: n1 = DEF_DOUBLE_LINE8_OUT;
-                 n2 = DEF_DOUBLE_LINE8_IN;
-                 n3 = DEF_DOUBLE_LINE8_DIST;	 break;
-        case 11: n1 = DEF_DOUBLE_LINE9_OUT;
-                 n2 = DEF_DOUBLE_LINE9_IN;
-                 n3 = DEF_DOUBLE_LINE9_DIST;	 break;
-        case 12: n1 = DEF_DOUBLE_LINE10_OUT;
-                 n2 = DEF_DOUBLE_LINE10_IN;
-                 n3 = DEF_DOUBLE_LINE10_DIST; break;
-        case 13: n1 = DEF_DOUBLE_LINE3_OUT;
-                 n2 = DEF_DOUBLE_LINE3_IN;
-                 n3 = DEF_DOUBLE_LINE3_DIST;	 break;
-        case 14: n1 = DEF_DOUBLE_LINE4_OUT;
-                 n2 = DEF_DOUBLE_LINE4_IN;
-                 n3 = DEF_DOUBLE_LINE4_DIST;	 break;
-        case 15: n1 = DEF_DOUBLE_LINE5_OUT;
-                 n2 = DEF_DOUBLE_LINE5_IN;
-                 n3 = DEF_DOUBLE_LINE5_DIST;	 break;
-        case 16: n1 = DEF_DOUBLE_LINE6_OUT;
-                 n2 = DEF_DOUBLE_LINE6_IN;
-                 n3 = DEF_DOUBLE_LINE6_DIST;	 break;
-        case 17:
-                 n1 = DEF_LINE_WIDTH_5;
-                 nStyle = DOTTED;
-                 break;
-        case 18:
-                 n1 = DEF_LINE_WIDTH_5;
-                 nStyle = DASHED;
-                 break;
-        case  0:
-        default:
-            bSetLine = sal_False;
-            break;
-    }
-    if ( bSetLine )
+    SvxBorderStyle  nStyle = NO_STYLE;
+
+    if ( aLineSet.GetSelectItemId( ) > 0 )
+        nStyle = SvxBorderStyle( aLineSet.GetSelectItemId( ) - 1 );
+
+    if ( nStyle != NO_STYLE )
     {
         SvxBorderLine aTmp;
-        aTmp.SetLinesWidths( nStyle, n1, n2, n3 );
+        // TODO Make it depend on a width field
+        aTmp.SetWidth( DEF_LINE_WIDTH_0 );
         aLineItem.SetLine( &aTmp );
     }
     else