summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2013-05-15 01:28:50 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2013-05-15 05:58:18 +0000
commit2904e4d618a57771662ef435df0f478423714e41 (patch)
treeb06b59c0de57dc8b14f3ce30defd66a7be2e5460
parent417666b84464d121b1dc9c518d2043973e072ca5 (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) Reviewed-on: https://gerrit.libreoffice.org/3910 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r--oox/source/ppt/extdrawingfragmenthandler.cxx7
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() );
+ }
}
} }