From e63e3e37f335e5729c59a0139c874cca02f83d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 30 Aug 2017 09:22:45 +0100
Subject: [PATCH] Resolves tdf#112101 crash on particular file with
 office:event-listeners
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I99a007543f90f4024666d296e9a775f8cee15086
Reviewed-on: https://gerrit.libreoffice.org/41723
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 sw/qa/core/data/odt/pass/tdf112101.odt | Bin 0 -> 1935 bytes
 xmloff/source/text/txtparai.cxx        |   5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 sw/qa/core/data/odt/pass/tdf112101.odt

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 0000000000000000000000000000000000000000..ca29bd732ea471e6d64326bf810206f292ff2366
GIT binary patch
literal 1935
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
RH!B-RjtvN-fS!>D^8on<??V6p

literal 0
HcmV?d00001

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index b52f9f45061d..9455c1068324 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