From b0176f6245b996cdfabdce7ca299b95e4b64bb88 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 5 Oct 2012 15:30:11 +0200 Subject: vml import: only apply width-percent attribute if it's != 0 This fixes an issue with a shape defined with these attributes: mso-width-percent:0;mso-height-percent:0 and mso-width-relative:page;mso-height-relative:page; where all points were then located in (0,0) Change-Id: I51070ad2b2e4e05ab64f16813472ca1d7099fb09 Reviewed-on: https://gerrit.libreoffice.org/775 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- oox/source/vml/vmlshape.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'oox') diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index fcc0da5a5a20..8d84edd33418 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -463,7 +463,9 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes if ( maTypeModel.maWidthRelative.isEmpty() || maTypeModel.maWidthRelative == "page" ) { sal_Int16 nWidth = maTypeModel.maWidthPercent.toInt32() / 10; - PropertySet( xShape ).setAnyProperty(PROP_RelativeWidth, makeAny( nWidth ) ); + // Only apply if nWidth != 0 + if ( nWidth ) + PropertySet( xShape ).setAnyProperty(PROP_RelativeWidth, makeAny( nWidth ) ); } } if ( !maTypeModel.maHeightPercent.isEmpty( ) ) @@ -472,7 +474,9 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes if ( maTypeModel.maHeightRelative.isEmpty() || maTypeModel.maHeightRelative == "page" ) { sal_Int16 nHeight = maTypeModel.maHeightPercent.toInt32() / 10; - PropertySet( xShape ).setAnyProperty(PROP_RelativeHeight, makeAny( nHeight ) ); + // Only apply if nHeight != 0 + if ( nHeight ) + PropertySet( xShape ).setAnyProperty(PROP_RelativeHeight, makeAny( nHeight ) ); } } } -- cgit