[Libreoffice-commits] core.git: oox/source

[Grzegorz Araminowicz]

 oox/source/drawingml/diagram/layoutnodecontext.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b1601f7333181a04583612ac3b73e68bd7842c88
Author: Grzegorz Araminowicz <g.araminowicz at gmail.com>
Date:   Thu Jul 20 12:38:13 2017 +0200

    SmartArt: support hideGeom shape attrbute
    
    Change-Id: I970024ec2b28fd6f004acdc67acbc39067b5efe2
    Reviewed-on: https://gerrit.libreoffice.org/40224
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 715e94d72eab..3a0aeba11563 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -251,9 +251,12 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
         if( rAttribs.hasAttribute( XML_type ) )
         {
             pShape.reset( new Shape("com.sun.star.drawing.CustomShape") );
-            const sal_Int32 nType(rAttribs.getToken( XML_type, XML_obj ));
-            pShape->setSubType( nType );
-            pShape->getCustomShapeProperties()->setShapePresetType( nType );
+            if (!rAttribs.getBool(XML_hideGeom, false))
+            {
+                const sal_Int32 nType(rAttribs.getToken( XML_type, XML_obj ));
+                pShape->setSubType( nType );
+                pShape->getCustomShapeProperties()->setShapePresetType( nType );
+            }
         }
         else
         {