diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2013-05-15 01:28:50 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-05-15 01:36:32 +0200 |
| commit | e00faa6f01ea4437c25c64cb5b7fa7fbfdfdb9f2 (patch) | |
| tree | 5dac5bb17d1d87af337874fd3361bc5211e3a696 /oox | |
| parent | 44d92cfa4143475dba8414a94150bc669aeb9909 (diff) | |
Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.
Just don't assume the DSP_TOKEN( spTree ) was seen in input.
Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
(cherry picked from commit 0f15a477aaba2f69a13c0bc61c5c8c7a47314680)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/extdrawingfragmenthandler.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index f0654151b6be..dc62bd6984bd 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -86,8 +86,11 @@ ExtDrawingFragmentHandler::createFastChildContext( ::sal_Int32 aElement, } void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) { - mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() ); - mpShapePtr->setName( mpOrgShapePtr->getName() ); + if( mpShapePtr ) + { + mpShapePtr->moveAllToPosition( mpOrgShapePtr->getPosition() ); + mpShapePtr->setName( mpOrgShapePtr->getName() ); + } } } } |