strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#144890 Invalid selection area when text in LTR run

Browse source 
In
    commit ec50b9e5ea
    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 <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2022-01-07 22:50:29 +02:00 committed by Noel Grandin
parent b2d742faa0
commit 563af8fd15
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/source/core/layout/trvlfrm.cxx
View file

@ -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