Kaydet (Commit) f5ccbfdc authored tarafından Miklos Vajna's avatar Miklos Vajna

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
üst a87e8268
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment