mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vml import: only apply width-percent attribute if it's != 0

Browse Source 
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 <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2012-10-05 15:30:11 +02:00
committed by Petr Mladek
parent e6b28a09f4
commit b0176f6245
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oox/source/vml/vmlshape.cxx
View File

@@ -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 ) );
}
}
}