Fix border selector to use the new widths system

5 files changed, 9 insertions, 12 deletions

diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 05260db234d8..d088a8f28451 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3203,7 +3203,8 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
     rStrm >> aColor >> nOutline >> nInline >> nDistance;
     if( nOutline )
     {
-        SvxBorderLine aLine( &aColor, nOutline, nInline, nDistance );
+        SvxBorderLine aLine( &aColor );
+        aLine.SetLinesWidths( SOLID, nInline, nOutline, nDistance );
         _pLine->SetLine( &aLine );
     }
     return _pLine;
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index cf1eba03180f..395cf5194936 100755
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -162,8 +162,7 @@ public:
     void                SelectAllVisibleBorders( bool bSelect = true );
 
     /** Sets the passed line widths to all selected frame borders (in twips). */
-    void                SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec,
-                                             SvxBorderStyle nStyle );
+    void                SetStyleToSelection( long nWidth, SvxBorderStyle nStyle );
     /** Sets the passed color to all selected frame borders. */
     void                SetColorToSelection( const Color& rColor );
 
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 56ab07dad111..65007cfe6f27 100755
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -969,13 +969,10 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
         mxImpl->SelectBorder( **aIt, bSelect );
 }
 
-void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn,
-       SvxBorderStyle nStyle )
+void FrameSelector::SetStyleToSelection( long nWidth, SvxBorderStyle nStyle )
 {
-    mxImpl->maCurrStyle.SetOutWidth( nPrim );
-    mxImpl->maCurrStyle.SetDistance( nDist );
-    mxImpl->maCurrStyle.SetInWidth( nSecn );
     mxImpl->maCurrStyle.SetStyle( nStyle );
+    mxImpl->maCurrStyle.SetWidth( nWidth );
     for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
         mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
 }
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 4fe67a7af3dc..6b900dd8f131 100755
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -506,8 +506,7 @@ namespace sdr
 
                     if(bMirror)
                     {
-                        aLine.SetOutWidth(pLine->GetInWidth());
-                        aLine.SetInWidth(pLine->GetOutWidth());
+                        aLine.SetMirrorWidths( );
                     }
 
                     return;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 76d44af7a300..16f23c6d5ef4 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.SetOutWidth( DEF_LINE_WIDTH_0 );
+    theDefLine.SetLinesWidths( theDefLine.GetStyle(), 0, DEF_LINE_WIDTH_0, 0 );
     switch ( nSel )
     {
         case 1: nValidFlags |= FRM_VALID_ALL;
@@ -1619,7 +1619,8 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
     }
     if ( bSetLine )
     {
-        SvxBorderLine aTmp( NULL, n1, n2, n3, nStyle );
+        SvxBorderLine aTmp;
+        aTmp.SetLinesWidths( nStyle, n1, n2, n3 );
         aLineItem.SetLine( &aTmp );
     }
     else