From 748a636b5150dbab9d92832bd0f422f57b406114 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 14 Dec 2011 15:05:15 +0100 Subject: [PATCH] use custom shapes for curved connector shapes - they looks correctly visually, we can make then connector shapes once we have new implementation --- oox/source/drawingml/customshapeproperties.cxx | 16 ---------------- oox/source/drawingml/shapepropertiescontext.cxx | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 12a7f29a2cf2..3f3bcdb8d6f8 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -126,22 +126,6 @@ static OUString GetConnectorShapeType( sal_Int32 nType ) static const OUString sBentConnector5 = CREATE_OUSTRING( "mso-spt36" ); sType = sBentConnector5; } break; - case XML_curvedConnector2: { - static const OUString sCurvedConnector2 = CREATE_OUSTRING( "mso-spt37" ); - sType = sCurvedConnector2; - } break; - case XML_curvedConnector3: { - static const OUString sCurvedConnector3 = CREATE_OUSTRING( "mso-spt38" ); - sType = sCurvedConnector3; - } break; - case XML_curvedConnector4: { - static const OUString sCurvedConnector4 = CREATE_OUSTRING( "mso-spt39" ); - sType = sCurvedConnector4; - } break; - case XML_curvedConnector5: { - static const OUString sCurvedConnector5 = CREATE_OUSTRING( "mso-spt40" ); - sType = sCurvedConnector5; - } break; default: break; } diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx index 1d2a216b4853..7f862e4f91af 100644 --- a/oox/source/drawingml/shapepropertiescontext.cxx +++ b/oox/source/drawingml/shapepropertiescontext.cxx @@ -88,6 +88,7 @@ Reference< XFastContextHandler > ShapePropertiesContext::createFastChildContext( mrShape.getServiceName() = sLineShape; } if( ( nToken >= XML_bentConnector2 && nToken <= XML_bentConnector5 ) || + ( nToken >= XML_curvedConnector2 && nToken <= XML_curvedConnector5 ) || nToken == XML_straightConnector1 ) { static const OUString sCustomShape( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.CustomShape" ) );