[Libreoffice-commits] core.git: oox/source

[Mike Kaganski (via logerrit)]

 oox/source/drawingml/customshapeproperties.cxx |   27 +++----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 97cc576a4aebd9b0c0b34b62f562f0386a137332
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Nov 5 12:58:56 2021 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Nov 5 13:12:40 2021 +0100

    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.kagan...@collabora.com>

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;