1 files changed, 1 insertions, 7 deletions
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index e0fc3274c731..935cc4970c7c 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -62,16 +62,10 @@ ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementTok
         {
             sal_Int32 nToken = rAttribs.getToken( XML_prst, 0 );
             // TODO: Move the following checks to a separate place or as a separate function
-            if ( nToken == XML_line )
+            if (nToken == XML_line && !mrShape.isConnectorShape())
             {
                 mrShape.getServiceName() = "com.sun.star.drawing.LineShape";
             }
-            if( ( nToken >= XML_bentConnector2 && nToken <= XML_bentConnector5 ) ||
-                ( nToken >= XML_curvedConnector2 && nToken <= XML_curvedConnector5 ) ||
-                  nToken == XML_straightConnector1 )
-            {
-                mrShape.getServiceName() = "com.sun.star.drawing.CustomShape";
-            }
 
             // We got a preset geometry, forget the geometry inherited from the placeholder shape.
             mrShape.getCustomShapeProperties() = std::make_shared<CustomShapeProperties>();