diff options
| author | Radek Doulik <rodo@novell.com> | 2011-12-07 13:37:12 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-07 17:19:56 +0100 |
| commit | 5fd4ee9147dcd33c770e396843c5fda722b12f86 (patch) | |
| tree | 531bd6b08d27fa231912d8d5542fbb0fce71889f | |
| parent | fe8f640328c6a7c1f99fa232621cecf7ee704921 (diff) | |
pptx: make sure we set right type for connector shapes
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index e0c1fd7f29ad..77eb2967f169 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -167,8 +167,10 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi OSL_TRACE("connector shape: %s (%d)", USS(sConnectorShapeType), mnShapePresetType); //const uno::Reference < drawing::XShape > xShape( xPropSet, UNO_QUERY ); Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( xShape, UNO_QUERY ); - if( xDefaulter.is() ) + if( xDefaulter.is() ) { xDefaulter->createCustomShapeDefaults( sConnectorShapeType ); + aPropertyMap[ PROP_Type ] <<= Any( sConnectorShapeType ); + } } else if (maPresetsMap.find(mnShapePresetType) != maPresetsMap.end()) { @@ -229,7 +231,10 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi } else if ( aGeoPropSeq[ i ].Name.equals( sType ) ) { - aGeoPropSeq[ i ].Value <<= CREATE_OUSTRING( "ooxml-CustomShape" ); + if ( sConnectorShapeType.getLength() > 0 ) + aGeoPropSeq[ i ].Value <<= sConnectorShapeType; + else + aGeoPropSeq[ i ].Value <<= CREATE_OUSTRING( "ooxml-CustomShape" ); } } } |