sw/source/core/layout/paintfrm.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 8f44345f1e3e604dae86fef438014d4941b1d298 Author: Zolnai Tamás <zolnaitamas2...@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/17979 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4a27d6f..0d8bcaa 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -477,13 +477,13 @@ static sal_uInt8 lcl_TryMergeLines( { double const fMergeGap(properties.nSPixelSzW + properties.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;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits