sw/source/core/txtnode/txtedt.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d3031765b429beed0ddae2b53b54e7633432bc23
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Jan 15 13:27:00 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 16 14:51:23 2019 +0100
tdf#122722 sw: fix hidden text crash in SwTextFrame::GetCurWord()
A frame that is fully hidden does not have a SwParaPortion,
see SwTextFrame::Format() early return.
(regression from 9bda4a67565817f0a26f48c4a4b9723894a385f5)
Change-Id: I6b06824e53cef7218b60f60fced8f863adad8b62
Reviewed-on: https://gerrit.libreoffice.org/66385
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit 0623861685dd1c9daa72a1002f5b018d5c5ef03c)
Reviewed-on: https://gerrit.libreoffice.org/66399
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
Tested-by: Xisco Faulí <xiscofa...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index d3e640531f79..41e288a74ec8 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -703,7 +703,7 @@ OUString SwTextFrame::GetCurWord(SwPosition const& rPos)
const
OUString const& rText(GetText());
assert(sal_Int32(nPos) <= rText.getLength()); // invalid index
- if (rText.isEmpty())
+ if (rText.isEmpty() || IsHiddenNow())
return OUString();
assert(g_pBreakIt && g_pBreakIt->GetBreakIter().is());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
