mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves tdf#112101 crash on particular file with office:event-listeners

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2017-08-30 09:22:45 +01:00
parent 1cfe6a904d
commit e63e3e37f3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/core/data/odt/pass/tdf112101.odt Normal file
View File

Binary file not shown.

5
xmloff/source/text/txtparai.cxx
View File

@@ -427,7 +427,7 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
XMLImpHyperlinkContext_Impl::~XMLImpHyperlinkContext_Impl() XMLImpHyperlinkContext_Impl::~XMLImpHyperlinkContext_Impl()
{ {
if( mpHint != nullptr ) if (mpHint)
mpHint->SetEnd( GetImport().GetTextImport() mpHint->SetEnd( GetImport().GetTextImport()
->GetCursorAsRange()->getStart() ); ->GetCursorAsRange()->getStart() );
} }
@@ -441,7 +441,8 @@ SvXMLImportContext *XMLImpHyperlinkContext_Impl::CreateChildContext(
{ {
XMLEventsImportContext* pCtxt = new XMLEventsImportContext( XMLEventsImportContext* pCtxt = new XMLEventsImportContext(
GetImport(), nPrefix, rLocalName); GetImport(), nPrefix, rLocalName);
mpHint->SetEventsContext(pCtxt); if (mpHint)
mpHint->SetEventsContext(pCtxt);
return pCtxt; return pCtxt;
} }
else else