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:31:06 +0200 |
| commit | 0f15a477aaba2f69a13c0bc61c5c8c7a47314680 (patch) | |
| tree | 0540039db7c0001b2d21246f57af27f1002288a5 /oox | |
| parent | 5d2f3957bdda0eb2e7d68b0dcf7ae6a0b50ef48b (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
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 bc1adf341924..7fecb8906530 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -65,8 +65,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() ); + } } } } |