diff options
| author | Radek Doulik <rodo@novell.com> | 2011-11-03 11:37:16 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2011-11-07 12:08:27 +0100 |
| commit | 8ed962b9a9c746ef852f7d0c3dbed0faf1c33fd6 (patch) | |
| tree | a858db16e8deda7345828ab96da62030423ec8c5 | |
| parent | 858b404472c09a140d05b2e8e83a7655fbe5e708 (diff) | |
fix build
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index a23bf19a8328..f794c6f954b1 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -113,7 +113,9 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi OSL_TRACE("found property map for preset: %s (%d)", USS(getShapePresetTypeName()), mnShapePresetType); aPropertyMap = maPresetsMap[ mnShapePresetType ]; +#ifdef DEBUG aPropertyMap.dump(); +#endif } else { @@ -182,7 +184,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi { sal_uInt32 i; PropertyMap aPropertyMap; - aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "non-primitive" ); + aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "ooxml-non-primitive" ); aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX ); aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY ); awt::Size aSize( xShape->getSize() ); @@ -207,11 +209,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi } aPropertyMap[ PROP_AdjustmentValues ] <<= aAdjustmentValues; - Sequence< rtl::OUString > aEquations( maGuideList.size() ); - for ( i = 0; i < maGuideList.size(); i++ ) - aEquations[ i ] = maGuideList[ i ].maFormula; - aPropertyMap[ PROP_Equations ] <<= aEquations; - PropertyMap aPath; Sequence< EnhancedCustomShapeSegment > aSegments( maSegments.size() ); for ( i = 0; i < maSegments.size(); i++ ) @@ -228,6 +225,11 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi Sequence< PropertyValue > aPathSequence = aPath.makePropertyValueSequence(); aPropertyMap[ PROP_Path ] <<= aPathSequence; + Sequence< rtl::OUString > aEquations( maGuideList.size() ); + for ( i = 0; i < maGuideList.size(); i++ ) + aEquations[ i ] = maGuideList[ i ].maFormula; + aPropertyMap[ PROP_Equations ] <<= aEquations; + Sequence< PropertyValues > aHandles( maAdjustHandleList.size() ); for ( i = 0; i < maAdjustHandleList.size(); i++ ) { |