From beba4603ee8e603fff2599bee7f157d90872cb99 Mon Sep 17 00:00:00 2001 From: Muthu Subramanian Date: Fri, 27 Dec 2013 19:59:22 +0530 Subject: fdo#72998: Custom shapes have improper size. --- oox/source/drawingml/customshapeproperties.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'oox') diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 48ace8bec689..247e8cf9880e 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -213,7 +213,13 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi aPropertyMap[ PROP_Type ] <<= OUString( "ooxml-non-primitive" ); aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX ); aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY ); + // Note 1: If Equations are defined - they are processed using internal div by 360 coordinates + // while if they are not, standard ooxml coordinates are used. + // This size specifically affects scaling. + // Note 2: Width and Height are set to 0 to force scaling to 1. awt::Rectangle aViewBox( 0, 0, aSize.Width, aSize.Height ); + if( maGuideList.size() ) + aViewBox = awt::Rectangle( 0, 0, 0, 0 ); aPropertyMap[ PROP_ViewBox ] <<= aViewBox; Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentValues( maAdjustmentGuideList.size() ); -- cgit