diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-05-19 16:42:44 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-05-20 11:07:26 +0200 |
| commit | 2a1a6bbd6f51ab28e8faea82d76d91f9cab6fb23 (patch) | |
| tree | e22be910c19a964562bd68cccc40a3036ce6f6ad | |
| parent | de7bff3c8ff76f29923615a66f429968b8d50c3c (diff) | |
don't de-reference null pointer - fix crash with certain PPTX files
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
| -rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index c18fd4aad..cbae082c8 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -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 ); |