[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source

[Thorsten Behrens]

 oox/source/ppt/extdrawingfragmenthandler.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2904e4d618a57771662ef435df0f478423714e41
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed May 15 01:28:50 2013 +0200

    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 at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index f065415..dc62bd6 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() );
+    }
 }
 
 } }