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

[Miklos Vajna]

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

New commits:
commit f5ccbfdc561c68099872d1abe07ac72fcddedd35
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 17 20:22:44 2014 +0200

    oox customshapepreset: switch to generated data -> code
    
    With this, oox/source/drawingml/customshapepresets*.cxx becomes unused
    code, while share/filter/oox-drawingml-cs-presets in instdir becomes a
    requirement.
    
    Change-Id: Ia886a47295514bbacd1e522273c59f0656e4cf6b

diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 229251e..7a07c2a 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -117,8 +117,8 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
     {
         OSL_TRACE("preset: %d", mnShapePresetType);
 
-        if (maPresetsMap.empty())
-            initializePresetsMap();
+        if (maPresetDataMap.empty())
+            initializePresetDataMap();
 
         PropertyMap aPropertyMap;
         PropertySet aPropSet( xPropSet );
@@ -135,13 +135,11 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
                 aPropertyMap.setProperty( PROP_Type, sConnectorShapeType );
             }
         }
-        else if (maPresetsMap.find(mnShapePresetType) != maPresetsMap.end())
+        else if (maPresetDataMap.find(mnShapePresetType) != maPresetDataMap.end())
         {
             OSL_TRACE("found property map for preset: %s (%d)", USS(getShapePresetTypeName()), mnShapePresetType);
 
-            CustomShapeProvider *pProvider = maPresetsMap[ mnShapePresetType ];
-            if (pProvider)
-                aPropertyMap = pProvider->getProperties();
+            aPropertyMap = maPresetDataMap[mnShapePresetType];
 #ifdef DEBUG
             aPropertyMap.dumpCode();
 #endif