summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-30 09:22:45 +0100
committerAndras Timar <andras.timar@collabora.com>2017-09-01 16:17:24 +0200
commit6d3c174ce7fcd21ec7f080c68399ca147f3fbec0 (patch)
treeca771d28ad4770f5df0d2689fa9183e36b71ef7c /xmloff
parentb7df772e5d32d930927605d6e02a35d9e60bc6dd (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> (cherry picked from commit fb8fba4a99e71ba9faa9d93dc126bae80baffdde)
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtparai.cxx5
1 files changed, 3 insertions, 2 deletions
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