[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/source

[Kohei Yoshida]

 sw/source/core/layout/paintfrm.cxx |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 3205bbedfbc8cc76125eb53acc1e6281748f5876
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jan 22 09:01:04 2014 -0500

    fdo#73886: Let's keep the "left" border outer and "right" inner.
    
    This reduces the complexity a bit.
    
    Change-Id: Ieefb57be86e5b66f319920fa61c88d0027c38164

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 615d7d8..4762252 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4614,16 +4614,10 @@ lcl_MakeBorderLine(SwRect const& rRect,
         ?   lcl_GetExtent(0, pEndNeighbour)
         :   lcl_GetExtent(pEndNeighbour, 0);
 
-    double const nLeftWidth = (isLeftOrTopBorder == isVertical)
-         ? rBorder.GetInWidth() : rBorder.GetOutWidth();
-    double const nRightWidth = (isLeftOrTopBorder == isVertical)
-         ? rBorder.GetOutWidth() : rBorder.GetInWidth();
-    Color const aLeftColor = (isLeftOrTopBorder == isVertical)
-        ? rBorder.GetColorIn(isLeftOrTopBorder)
-        : rBorder.GetColorOut(isLeftOrTopBorder);
-    Color const aRightColor = (isLeftOrTopBorder == isVertical)
-        ? rBorder.GetColorOut(isLeftOrTopBorder)
-        : rBorder.GetColorIn(isLeftOrTopBorder);
+    double const nLeftWidth = rBorder.GetOutWidth();
+    double const nRightWidth = rBorder.GetInWidth();
+    Color const aLeftColor = rBorder.GetColorOut(isLeftOrTopBorder);
+    Color const aRightColor = rBorder.GetColorIn(isLeftOrTopBorder);
 
     ::rtl::Reference<BorderLinePrimitive2D> const xLine =
         new BorderLinePrimitive2D(