1 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index a6687bc73078..1d2a216b4853 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -81,11 +81,18 @@ Reference< XFastContextHandler > ShapePropertiesContext::createFastChildContext(
     case A_TOKEN( prstGeom ):   // preset geometry "CT_PresetGeometry2D"
         {
             sal_Int32 nToken = xAttribs->getOptionalValueToken( XML_prst, 0 );
+            // TODO: Move the following checks to a separate place or as a separate function
             if ( nToken == XML_line )
             {
                 static const OUString sLineShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineShape" ) );
                 mrShape.getServiceName() = sLineShape;
             }
+            if( ( nToken >= XML_bentConnector2 && nToken <= XML_bentConnector5 ) ||
+                  nToken == XML_straightConnector1 )
+            {
+                static const OUString sCustomShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.CustomShape" ) );
+                mrShape.getServiceName() = sCustomShape;
+            }
             xRet.set( new PresetShapeGeometryContext( *this, xAttribs, *(mrShape.getCustomShapeProperties()) ) );
         }
         break;