[Libreoffice-commits] core.git: drawinglayer/source sw/source

[Kohei Yoshida]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |    4 ----
 sw/source/core/layout/paintfrm.cxx                      |   14 ++++----------
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit d17c9ee705f9885f61f84dc2d244c4d0c0c39928
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jan 22 11:37:33 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/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 891d71f..5e055fa 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -302,8 +302,6 @@ namespace drawinglayer
                     const basegfx::BColor aLineColor =
                         maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
                     double nThick = rtl::math::round(rSource.getLeftWidth());
-                    if (!nThick)
-                        nThick = rtl::math::round(rSource.getRightWidth());
 
                     bool bDouble = rSource.getStyle() == table::BorderLineStyle::DOUBLE;
 
@@ -414,8 +412,6 @@ namespace drawinglayer
                         return false;
 
                     double nThick = rtl::math::round(rSource.getLeftWidth());
-                    if (!nThick)
-                        nThick = rtl::math::round(rSource.getRightWidth());
 
                     const basegfx::BColor aLineColor =
                         maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 4bb672a..b173c1e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4757,16 +4757,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(