diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-20 12:57:24 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-20 15:44:26 +0100 |
| commit | 99273001ca7b4dfa98d881ef6ed46cbcad1af8c9 (patch) | |
| tree | e8dc86c3e961ff909023b83cb4b69a3077a1b1f6 | |
| parent | 8c94b3c82cb80a1f3cae29f0b841ea9c9eea5e7b (diff) | |
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@cib.de>
(cherry picked from commit df1adbec35df3cdb16b97cf8a9b85bf4a935ff41)
Reviewed-on: https://gerrit.libreoffice.org/65494
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 |