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 | 9bd78655198ad497bef9872422a1004cfbf8698f (patch) | |
| tree | 1977de2e31348fcbefb486b7f50d59e5c223844f /svx/source | |
| parent | 302b7b094d87184530af66be91fef91b6dce1d12 (diff) | |
Fixed units mess in SvxBorderLine and BorderLineImpl
Diffstat (limited to 'svx/source')
| -rwxr-xr-x | svx/source/dialog/frmsel.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 65007cfe6f27..c0badf227606 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; |