strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't de-reference null pointer - fix crash with certain PPTX files

Browse source
This commit is contained in:
Michael Meeks 2011-05-19 16:42:44 +01:00
parent accf94cab8
commit 3cc072ce7a
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
oox/source/ppt/presentationfragmenthandler.cxx
View file

@ -246,11 +246,13 @@ void PresentationFragmentHandler::endDocument() throw (SAXException, RuntimeExce
}
// importing slide page
pSlidePersistPtr->setMasterPersist( pMasterPersistPtr );
pSlidePersistPtr->setTheme( pMasterPersistPtr->getTheme() );
Reference< drawing::XMasterPageTarget > xMasterPageTarget( pSlidePersistPtr->getPage(), UNO_QUERY );
if( xMasterPageTarget.is() )
xMasterPageTarget->setMasterPage( pMasterPersistPtr->getPage() );
if (pMasterPersistPtr.get()) {
pSlidePersistPtr->setMasterPersist( pMasterPersistPtr );
pSlidePersistPtr->setTheme( pMasterPersistPtr->getTheme() );
Reference< drawing::XMasterPageTarget > xMasterPageTarget( pSlidePersistPtr->getPage(), UNO_QUERY );
if( xMasterPageTarget.is() )
xMasterPageTarget->setMasterPage( pMasterPersistPtr->getPage() );
}
rFilter.getDrawPages().push_back( pSlidePersistPtr );
rFilter.setActualSlidePersist( pSlidePersistPtr );
importSlide( xSlideFragmentHandler, pSlidePersistPtr );