diff options
| -rw-r--r-- | oox/inc/oox/drawingml/customshapeproperties.hxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 5 | ||||
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx index ec41bb1b4c01..e38963358910 100644 --- a/oox/inc/oox/drawingml/customshapeproperties.hxx +++ b/oox/inc/oox/drawingml/customshapeproperties.hxx @@ -130,7 +130,7 @@ public: void pushToPropSet( const ::oox::core::FilterBase& rFilterBase, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, - const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape); + const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape, const ::com::sun::star::awt::Size &aSize ); sal_Int32 getShapePresetType() const { return mnShapePresetType; } ::rtl::OUString getShapePresetTypeName() const; diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 98115027b9a0..598bb3f9b1a4 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -111,7 +111,7 @@ static OUString GetConnectorShapeType( sal_Int32 nType ) void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */, - const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape ) + const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape, const awt::Size &aSize ) { if ( mnShapePresetType >= 0 ) { @@ -216,8 +216,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "ooxml-non-primitive" ); aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX ); aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY ); - awt::Size aSize; - awt::Rectangle aViewBox( 0, 0, aSize.Width * 360, aSize.Height * 360 ); + awt::Rectangle aViewBox( 0, 0, aSize.Width, aSize.Height ); aPropertyMap[ PROP_ViewBox ] <<= aViewBox; Sequence< EnhancedCustomShapeAdjustmentValue > aAdjustmentValues( maAdjustmentGuideList.size() ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 2e460d3c53d2..5cd059ba7346 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -580,7 +580,7 @@ Reference< XShape > Shape::createAndInsert( } SAL_INFO("oox", "==cscode== shape name: '" << msName << "'"); - mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape ); + mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape, maSize ); } else if( getTextBody() ) getTextBody()->getTextProperties().pushVertSimulation(); |