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 14:26:49 +0100 |
| commit | df1adbec35df3cdb16b97cf8a9b85bf4a935ff41 (patch) | |
| tree | 675548c14d18f21b2dc9647a468db7b3b7e8726a | |
| parent | Convert canvasdemo to gbuild (diff) | |
| download | core-df1adbec35df3cdb16b97cf8a9b85bf4a935ff41.tar.gz core-df1adbec35df3cdb16b97cf8a9b85bf4a935ff41.zip | |
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>
| -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 9f0a459fb321..286bb465a516 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 |