[PATCH libreoffice-4-0] Fix fdo#64579 Don't assume dsp:dataModelExt has valid Drawin...

[Thorsten Behrens (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3910

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/3910/1

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)
---
M oox/source/ppt/extdrawingfragmenthandler.cxx
1 file changed, 5 insertions(+), 2 deletions(-)



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 @@
 }
 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() );
+    }
 }
 
 } }

-- 
To view, visit https://gerrit.libreoffice.org/3910
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Thorsten Behrens <tbehrens at suse.com>