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

[Zolnai Tamás]

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

New commits:
commit 4ffdf7fa5c2f1fbe16c010c2fef639eb0a0725b6
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Aug 23 19:15:14 2015 +0200

    tdf#91969: Parts of paragraph border is missing
    
    ...when border is around more than one paragraph
    
    Regression from:
    16f637dab3c1b5f7ac9eacf2c57347800d3fdf09
    
    Change-Id: Iea9455dd7cc3c301c3e2d5d7903c98d98e515595
    (cherry picked from commit 8d933132ab01f0070225fae6cf704c9a1982e8f8)
    Reviewed-on: https://gerrit.libreoffice.org/17996
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 7c395fb..ad7b6bd 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -476,13 +476,13 @@ static sal_uInt8 lcl_TryMergeLines(
 {
     double const fMergeGap(gProp.nSPixelSzW + gProp.nSHalfPixelSzW); // NOT static!
     // A is above/before B
-    if( mergeA.second <= mergeB.second &&
+    if( mergeA.second <= mergeB.first &&
         mergeA.second + fMergeGap >= mergeB.first )
     {
         return 1;
     }
     // B is above/before A
-    else if( mergeB.second <= mergeA.second &&
+    else if( mergeB.second <= mergeA.first &&
              mergeB.second + fMergeGap >= mergeA.first )
     {
         return 2;