[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sw/source

[Zolnai Tamás]

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

New commits:
commit 136cfba30fc49f66f1f365d13ee0e717c4cd8f53
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Tue Jul 22 14:01:40 2014 +0200

    fdo#79221: Wrong rendering of bottom and right character border
    
    Regression from 2cd1673f41cb5bd8502a9a48a5721244660fe3a0.
    
    SetMirrorWidths() works only when there are two lines
    (double border), but breaks one line borders.
    
    Change-Id: I2727afbc071bb4038c6cef18e6b96c796ef3a8b9
    (cherry picked from commit bdbf6cee5a3a012412699dba103b9f6430084722)
    Reviewed-on: https://gerrit.libreoffice.org/10460
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Joren De Cuyper <jorendc at libreoffice.org>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3e4ed87..3098638 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5080,7 +5080,8 @@ void PaintCharacterBorder(
 
     if( aBottomBorder )
     {
-        aBottomBorder->SetMirrorWidths(true);
+        if( aBottomBorder->isDouble() )
+            aBottomBorder->SetMirrorWidths(true);
 
         Point aLeftTop(
             aAlignedRect.Left(),
@@ -5118,7 +5119,8 @@ void PaintCharacterBorder(
 
     if( aRightBorder )
     {
-        aRightBorder->SetMirrorWidths(true);
+        if( aRightBorder->isDouble() )
+            aRightBorder->SetMirrorWidths(true);
 
         Point aLeftTop(
             aAlignedRect.Right() - aRightBorder.get().GetScaledWidth(),