diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-01-04 13:41:02 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 17:57:16 +0100 |
| commit | 95ef468983dc8a3dd03dfb6fb9de4a44d5255c1c (patch) | |
| tree | 31ef7bc1eabbf76bb592c6e7b1a5eb880572fd75 /svx | |
| parent | 107b2df50603cb030d50d5b34014972320a6e586 (diff) | |
Fixed units mess in SvxBorderLine and BorderLineImpl
Diffstat (limited to 'svx')
| -rwxr-xr-x | svx/inc/svx/frmsel.hxx | 5 | ||||
| -rwxr-xr-x | svx/source/dialog/frmsel.cxx | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index ee7b092d03..81d2946e7c 100755 --- a/svx/inc/svx/frmsel.hxx +++ b/svx/inc/svx/frmsel.hxx @@ -129,9 +129,8 @@ public: /** Returns true, if all visible frame borders have equal widths. @descr Ignores hidden and "don't care" frame borders. On success, - returns the widths in the passed parameters. */ - bool GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec, - SvxBorderStyle& rnStyle ) const; + returns the width in the passed parameter. */ + bool GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) const; /** Returns true, if all visible frame borders have equal color. @descr Ignores hidden and "don't care" frame borders. On success, returns the color in the passed parameter. */ diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 65007cfe6f..c0badf2276 100755 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -887,8 +887,7 @@ void FrameSelector::HideAllBorders() mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE ); } -bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn, - SvxBorderStyle& rnStyle ) const +bool FrameSelector::GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) const { VisFrameBorderCIter aIt( mxImpl->maEnabBorders ); if( !aIt.Is() ) @@ -898,16 +897,12 @@ bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal bool bFound = true; for( ++aIt; bFound && aIt.Is(); ++aIt ) bFound = - (rStyle.GetOutWidth() == (*aIt)->GetCoreStyle().GetOutWidth()) && - (rStyle.GetDistance() == (*aIt)->GetCoreStyle().GetDistance()) && - (rStyle.GetInWidth() == (*aIt)->GetCoreStyle().GetInWidth()) && + (rStyle.GetWidth() == (*aIt)->GetCoreStyle().GetWidth()) && (rStyle.GetStyle() == (*aIt)->GetCoreStyle().GetStyle()); if( bFound ) { - rnPrim = rStyle.GetOutWidth(); - rnDist = rStyle.GetDistance(); - rnSecn = rStyle.GetInWidth(); + rnWidth = rStyle.GetWidth(); rnStyle = rStyle.GetStyle(); } return bFound; |