diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-02-12 12:17:20 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-02-12 12:17:20 +0100 |
| commit | 586cec3019b28c0e936ec5976616caaf03254a01 (patch) | |
| tree | d9ac5477932150b7cc662c960878386880b86136 /sw/source/core/layout/trvlfrm.cxx | |
| parent | c1f57e52a8d2f14b59f3c17b0ee0e0078d96b39f (diff) | |
| parent | 422e0ad9fe102ac44466acc6a1748f967d61246b (diff) | |
Merge remote-tracking branch 'origin/libreoffice-7-2' into feature/cib_contract6721c
Update to upstream branch HEAD for 7.2.6 pre
Diffstat (limited to 'sw/source/core/layout/trvlfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/trvlfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 2ce4542351bd..1ad00bdc05ca 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2145,7 +2145,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor &rCursor) // If there's no doubleline portion involved or start and end are both // in the same doubleline portion, all works fine, but otherwise // we need the following... - if( (pSt2Pos || pEnd2Pos) && ( !pSt2Pos || !pEnd2Pos || + if( (!pSt2Pos && !pEnd2Pos) && ( !pSt2Pos || !pEnd2Pos || pSt2Pos->aPortion != pEnd2Pos->aPortion ) ) { // If we have a start(end) position inside a doubleline portion |