Kaydet (Commit) 8f44345f authored tarafından Zolnai Tamás's avatar Zolnai Tamás Kaydeden (comit) Caolán McNamara

tdf#91969: Parts of paragraph border is missing

...when border is around more than one paragraph

Regression from:
16f637da

Change-Id: Iea9455dd7cc3c301c3e2d5d7903c98d98e515595
(cherry picked from commit 8d933132)
Reviewed-on: https://gerrit.libreoffice.org/17979Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d5cc5bb3
...@@ -477,13 +477,13 @@ static sal_uInt8 lcl_TryMergeLines( ...@@ -477,13 +477,13 @@ static sal_uInt8 lcl_TryMergeLines(
{ {
double const fMergeGap(properties.nSPixelSzW + properties.nSHalfPixelSzW); // NOT static! double const fMergeGap(properties.nSPixelSzW + properties.nSHalfPixelSzW); // NOT static!
// A is above/before B // A is above/before B
if( mergeA.second <= mergeB.second && if( mergeA.second <= mergeB.first &&
mergeA.second + fMergeGap >= mergeB.first ) mergeA.second + fMergeGap >= mergeB.first )
{ {
return 1; return 1;
} }
// B is above/before A // B is above/before A
else if( mergeB.second <= mergeA.second && else if( mergeB.second <= mergeA.first &&
mergeB.second + fMergeGap >= mergeA.first ) mergeB.second + fMergeGap >= mergeA.first )
{ {
return 2; return 2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment