diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 20:22:44 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-17 20:23:35 +0200 |
| commit | f5ccbfdc561c68099872d1abe07ac72fcddedd35 (patch) | |
| tree | 9c5ecea8478155293ee6db53d0507503d802d2f7 /oox | |
| parent | a87e8268f8c32387052adf9a9283834dcf83e5ab (diff) | |
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
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 229251ee0838..7a07c2adae87 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 |