summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-11-05 12:58:56 +0200
committerMike Kaganski <mike.kaganski@collabora.com>2021-11-05 13:12:40 +0100
commit97cc576a4aebd9b0c0b34b62f562f0386a137332 (patch)
tree6f6f22b745df262b49df66196e6e82797041ca7c
parentb6c3adf356ca5f7b6f3d80e6062b58c92e6e2a11 (diff)
Drop code that modifies unused variable
aPropertyMap is not used after line 154 Change-Id: Id593d44c327d30e3074dee3430eb551160ad18fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124697 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx27
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;