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

[Gary Houston]

 oox/source/drawingml/diagram/diagramdefinitioncontext.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 84ce458a841f9b09b87ff045403b546c88c79168
Author: Gary Houston <ghouston at arglist.com>
Date:   Mon Dec 15 14:25:31 2014 +0000

    Resolves: fdo#87281 Crash on importing diagram in .docx file
    
    Change-Id: Ic2c7326ab83258e2e9dcbac88aa9f76f771a9b12
    (cherry picked from commit de41a2038ac44f71a9adef97e6ccea83c99dd1c2)

diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 7f43761..88b69f2 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -48,7 +48,9 @@ DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rPare
 
 DiagramDefinitionContext::~DiagramDefinitionContext()
 {
-    mpLayout->getNode()->dump(0);
+    LayoutNodePtr node = mpLayout->getNode();
+    if (node)
+        node->dump(0);
 }
 
 ContextHandlerRef