sw/qa/core/data/odt/pass/tdf112101.odt |binary xmloff/source/text/txtparai.cxx | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit e4aabf5c75104a1d97827aafdd97308ad0fb6c4e Author: Caolán McNamara <[email protected]> Date: Wed Aug 30 09:22:45 2017 +0100 Resolves tdf#112101 crash on particular file with office:event-listeners Change-Id: I99a007543f90f4024666d296e9a775f8cee15086 Reviewed-on: https://gerrit.libreoffice.org/41724 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/qa/core/data/odt/pass/tdf112101.odt b/sw/qa/core/data/odt/pass/tdf112101.odt new file mode 100644 index 000000000000..ca29bd732ea4 Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf112101.odt differ diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 61cb1e374153..e911a4c38516 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
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
