From 563af8fd15aa37e75af8882cccbdf8914ebe8e61 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 7 Jan 2022 22:50:29 +0200 Subject: [PATCH] tdf#144890 Invalid selection area when text in LTR run In commit ec50b9e5eaec7c94df35617676077ef0d65cecc7 no need to allocate Sw2LinesPos separately on heap I made this change, // 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 ) ) I tried to follow the explanation in the comment, since the existing comparison of pointers made no sense, since the two objects would always be distinct. However, that appears to have caused this bug, so change the comparison to directly represent the original logic. Change-Id: I95d6d870cecd762d4eb809d371e4a61b6641c85e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128133 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/source/core/layout/trvlfrm.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 05814632251b..0e99d2b3bd0a 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