From 9bd78655198ad497bef9872422a1004cfbf8698f Mon Sep 17 00:00:00 2001
From: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue, 4 Jan 2011 13:41:02 +0100
Subject: Fixed units mess in SvxBorderLine and BorderLineImpl

---
 svx/source/dialog/frmsel.cxx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'svx/source')

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;
-- 
cgit