diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-22 11:37:33 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-22 11:40:20 -0500 |
| commit | d17c9ee705f9885f61f84dc2d244c4d0c0c39928 (patch) | |
| tree | 6bf44b7a70e89ff51a3faad83de97e0ac59c21bf | |
| parent | 945394d8679e1f8c61d4cdab53420192a53472a6 (diff) | |
fdo#73886: Let's keep the "left" border outer and "right" inner.
This reduces the complexity a bit.
Change-Id: Ieefb57be86e5b66f319920fa61c88d0027c38164
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 891d71f3dfdf..5e055fa266b7 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 4bb672a0c4a5..b173c1e2961c 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( |