[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/text/txtfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99273001ca7b4dfa98d881ef6ed46cbcad1af8c9
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Dec 20 12:57:24 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Dec 20 15:44:26 2018 +0100

    sw_redlinehide: don't return COMPLETE_STRING from MapModelToView()
    
    The anchor position of a fly frame can be on an empty node after the
    last non-deleted text, and SwAnchoredObject::CheckCharRect()
    needs to get a valid frame index for that.
    
    This can be reproduced with ooo69593-1.odt.
    
    Change-Id: I448bb49d64e72b0af24306bd7c45755aa631b57d
    Reviewed-on: https://gerrit.libreoffice.org/65488
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit df1adbec35df3cdb16b97cf8a9b85bf4a935ff41)
    Reviewed-on: https://gerrit.libreoffice.org/65494

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 5d24dde866b3..4a44de62c9f8 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1145,7 +1145,7 @@ TextFrameIndex MapModelToView(MergedPara const& rMerged, SwTextNode const*const
         assert(nIndex <= pNode->Len());
         return TextFrameIndex(0);
     }
-    return TextFrameIndex(COMPLETE_STRING);
+    return TextFrameIndex(rMerged.mergedText.getLength());
 }
 
 } // namespace sw