diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-08-23 19:15:14 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-25 08:06:32 +0000 |
| commit | 8f44345f1e3e604dae86fef438014d4941b1d298 (patch) | |
| tree | d7303c9b388dabd0a96edab2080cb553a272ee4f | |
| parent | d5cc5bb38445c9b0acf33b463d722b504ac84df6 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 4a27d6fc4ec2..0d8bcaaf4945 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; |