diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-20 16:13:51 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-20 16:36:24 +0200 |
| commit | b5a1db961372b3fa66724ee580726c67e7683dbc (patch) | |
| tree | 0394c006d4e6b79b16f70d0a04aafe6c6978c54e | |
| parent | 4ba760078019fba15f9d0d33a6094960026b9dfb (diff) | |
n#779834 fix VML import of absolutely positioned image with no left margin
Given that we talk about mm100, changing 0 to 1 is not that harmful, and
it seems later core would crash without at least a small margin.
Change-Id: I913e4a5eeaba2e36b55f2d7d7fb5bdfbad8eae94
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 0bd3399f3c6f..fecade9a85bc 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -172,8 +172,13 @@ Rectangle ShapeType::getAbsRectangle() const if ( nHeight == 0 ) nHeight = 1; + sal_Int32 nLeft = ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maLeft, 0, true, true ) + + ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginLeft, 0, true, true ); + if (nLeft == 0 && maTypeModel.maPosition == "absolute") + nLeft = 1; + return Rectangle( - ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maLeft, 0, true, true ) + ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginLeft, 0, true, true ), + nLeft, ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maTop, 0, false, true ) + ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginTop, 0, false, true ), nWidth, nHeight ); } |