diff options
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 0aba70b7a337..e1d32a992619 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -154,32 +154,13 @@ void CustomShapeProperties::pushToPropSet( Sequence< PropertyValue > aSeq = aPropertyMap.makePropertyValueSequence(); aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq ); - static const OUStringLiteral sCustomShapeGeometry(u"CustomShapeGeometry"); - static const OUStringLiteral sAdjustmentValues(u"AdjustmentValues"); - uno::Any aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry ); - uno::Sequence< beans::PropertyValue > aGeoPropSeq; - - // ToDo: Using sAdjustmentValues in this "if" looks nonsense. - // It was introduced in revision acd2c909, which introduced the property "PresetTextWarp" - // for interoperability with Word. - if (aGeoPropSet >>= aGeoPropSeq) - { - for ( const auto& rGeoProp : std::as_const(aGeoPropSeq) ) - { - if ( rGeoProp.Name == sAdjustmentValues ) - { - OUString presetTextWarp; - if ( rGeoProp.Value >>= presetTextWarp ) - { - aPropertyMap.setProperty( PROP_PresetTextWarp, presetTextWarp ); - } - } - } - } - if ( !maAdjustmentGuideList.empty() ) { + static const OUStringLiteral sCustomShapeGeometry(u"CustomShapeGeometry"); + static const OUStringLiteral sAdjustmentValues(u"AdjustmentValues"); static const OUStringLiteral sType = u"Type"; + uno::Any aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry ); + uno::Sequence< beans::PropertyValue > aGeoPropSeq; if ( aGeoPropSet >>= aGeoPropSeq ) { // aGeoPropSeq gets modified in the loop, and gets copied elsewhere; |