summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-05-25 11:04:06 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-05-28 18:06:14 +0200
commitc52ba433491afbca70aa1977a624c795bdd5b9ef (patch)
tree47d9d5cf26d51b589c720c7b6d325bff331d2dba
parent3ac9b7af766f166a9cd8089ec49e54a48b31194b (diff)
Y, height are in Y coordinates
Change-Id: If75567533b5e00417f749bd8e957a317dda02804
-rw-r--r--oox/source/vml/vmlshape.cxx6
1 files changed, 3 insertions, 3 deletions
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<XShape> LineShape::implConvertAndInsert(const Reference<XShapes>& 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);
}