diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-08-31 15:15:41 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-07 11:52:33 +0200 |
| commit | 037d5fa9b129a4060f8f572cb72801b7dfa1608f (patch) | |
| tree | cbf0047199d88dc25b4e70479ac3f425b3372dd3 | |
| parent | 3ce90f78ed77c76ec6e0af3731f2fb37628ef89c (diff) | |
tdf#112122 xmloff: inserting index marks into editengine throws
Catch the exception, since that isn't even invalid input, editengine
just can't do it.
Change-Id: I362923889add4f1a1d3f8f18b0795993119d54b1
(cherry picked from commit 98552e46521b012e7694c056eca956ae4ee27a0c)
Reviewed-on: https://gerrit.libreoffice.org/41759
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | xmloff/source/text/txtparai.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index f2fad10da496..76d759f37f11 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -2110,8 +2110,15 @@ XMLParaContext::~XMLParaContext() Reference<beans::XPropertySet> xMark( static_cast<const XMLIndexMarkHint_Impl *>(pHint)->GetMark()); Reference<XTextContent> xContent(xMark, UNO_QUERY); - xTxtImport->GetText()->insertTextContent( - xAttrCursor, xContent, true ); + try + { + xTxtImport->GetText()->insertTextContent( + xAttrCursor, xContent, true ); + } + catch (uno::RuntimeException const& e) + { + SAL_INFO("xmloff.text", "could not insert index mark, presumably in editengine text " << e.Message); + } } break; case XML_HINT_TEXT_FRAME: |