diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-30 09:22:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-30 11:36:57 +0200 |
| commit | e63e3e37f335e5729c59a0139c874cca02f83d76 (patch) | |
| tree | 14a34b17ed04b02e95c7a6573bb5b3293ef23af2 | |
| parent | 1cfe6a904d3349413173f5d412c280936f938a9e (diff) | |
Resolves tdf#112101 crash on particular file with office:event-listeners
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>
| -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 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 |