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 | 302b7b094d87184530af66be91fef91b6dce1d12 (patch) | |
| tree | 1c69e85dd6292074f4678ac28e94afe6839e71fb /svx/source | |
| parent | 723943b939a95bbd8f8bf30cf3fac7c214703762 (diff) | |
Fix border selector to use the new widths system
Diffstat (limited to 'svx/source')
| -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 |
3 files changed, 6 insertions, 9 deletions
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 |