From c52ba433491afbca70aa1977a624c795bdd5b9ef Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 25 May 2012 11:04:06 +0200 Subject: Y, height are in Y coordinates Change-Id: If75567533b5e00417f749bd8e957a317dda02804 --- oox/source/vml/vmlshape.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'oox/source') diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 4000932ca127..0a10e07c0a9e 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -175,7 +175,7 @@ Rectangle ShapeType::getAbsRectangle() const if ( nWidth == 0 ) nWidth = 1; - sal_Int32 nHeight = ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maHeight, 0, true, true ); + sal_Int32 nHeight = ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maHeight, 0, false, true ); if ( nHeight == 0 ) nHeight = 1; @@ -464,10 +464,10 @@ Reference LineShape::implConvertAndInsert(const Reference& rxSh sal_Int32 nIndex = 0; aShapeRect.X = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maFrom.getToken(0, ',', nIndex), 0, true, true); - aShapeRect.Y = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maFrom.getToken(0, ',', nIndex), 0, true, true); + aShapeRect.Y = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maFrom.getToken(0, ',', nIndex), 0, false, true); nIndex = 0; aShapeRect.Width = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maTo.getToken(0, ',', nIndex), 0, true, true) - aShapeRect.X; - aShapeRect.Height = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maTo.getToken(0, ',', nIndex), 0, true, true) - aShapeRect.Y; + aShapeRect.Height = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maTo.getToken(0, ',', nIndex), 0, false, true) - aShapeRect.Y; return SimpleShape::implConvertAndInsert(rxShapes, aShapeRect); } -- cgit v1.2.3