diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-01-03 14:12:40 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 17:57:16 +0100 |
commit | 107b2df50603cb030d50d5b34014972320a6e586 (patch) | |
tree | 59b7a544d107b4569d924526967bc65839153383 /svx | |
parent | 0369047bf1e7efee2957d23db963831989dce673 (diff) |
Fix border selector to use the new widths system
Diffstat (limited to 'svx')
-rwxr-xr-x | svx/inc/svx/frmsel.hxx | 3 | ||||
-rwxr-xr-x | svx/source/dialog/frmsel.cxx | 7 | ||||
-rwxr-xr-x | svx/source/table/viewcontactoftableobj.cxx | 3 | ||||
-rwxr-xr-x | svx/source/tbxctrls/tbcontrl.cxx | 5 |
4 files changed, 7 insertions, 11 deletions
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index 07c6ccae97..ee7b092d03 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 56ab07dad1..65007cfe6f 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 a1efaae079..e0baafa34a 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 5c1f7979f1..0924ce8d26 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 |