diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-30 09:22:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-30 12:03:37 +0200 |
| commit | fb8fba4a99e71ba9faa9d93dc126bae80baffdde (patch) | |
| tree | f0ac7d770206b204a33fae58ecf540741edc4748 | |
| parent | 932a81e9c31a3a5bf5edad3d9e79b111e19b113d (diff) | |
Resolves tdf#112101 crash on particular file with office:event-listeners
Change-Id: I99a007543f90f4024666d296e9a775f8cee15086
Reviewed-on: https://gerrit.libreoffice.org/41725
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/qa/core/data/odt/pass/tdf112101.odt | bin | 0 -> 1935 bytes | |||
| -rw-r--r-- | xmloff/source/text/txtparai.cxx | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/qa/core/data/odt/pass/tdf112101.odt b/sw/qa/core/data/odt/pass/tdf112101.odt Binary files differnew file mode 100644 index 000000000000..ca29bd732ea4 --- /dev/null +++ b/sw/qa/core/data/odt/pass/tdf112101.odt diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index b37db9a9d551..f2fad10da496 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -427,7 +427,7 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl( XMLImpHyperlinkContext_Impl::~XMLImpHyperlinkContext_Impl() { - if( mpHint != nullptr ) + if (mpHint) mpHint->SetEnd( GetImport().GetTextImport() ->GetCursorAsRange()->getStart() ); } @@ -441,7 +441,8 @@ SvXMLImportContext *XMLImpHyperlinkContext_Impl::CreateChildContext( { XMLEventsImportContext* pCtxt = new XMLEventsImportContext( GetImport(), nPrefix, rLocalName); - mpHint->SetEventsContext(pCtxt); + if (mpHint) + mpHint->SetEventsContext(pCtxt); return pCtxt; } else |