diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-03-11 16:07:34 +0100 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-03-11 17:34:22 +0000 |
commit | cdd4a9fa539bcfc11dda35adda4b290ceab9e0b0 (patch) | |
tree | 8fdc4be9bf097ca0c3ee95c1f2a465e4e451b6b1 /sc/source/filter/oox/drawingfragment.cxx | |
parent | 28e61b634353110445e334ccaa415d7fb6629d62 (diff) |
Passing shaperect to addShape function is useless
Shaperect is ignored by createAndInsert() so it has no effect
at all. Also when this parameter is set the size and position
is set using the same shaperect, so don't need to pass it also
as a parameter.
Change-Id: I35a7953f3eda1bdd19af6f3e77c55b5c7e1f7161
Reviewed-on: https://gerrit.libreoffice.org/35073
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sc/source/filter/oox/drawingfragment.cxx')
-rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index c3626c42ac83..02944b7096a6 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -272,20 +272,20 @@ void DrawingFragment::onEndElement() getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Height, 0, SAL_MAX_INT32 ) ); // Make sure to set the position and size *before* calling addShape(). - mxShape->setPosition(Point(aShapeRectEmu.X, aShapeRectEmu.Y)); - mxShape->setSize(Size(aShapeRectEmu.Width, aShapeRectEmu.Height)); + mxShape->setPosition(Point(aShapeRectEmu32.X, aShapeRectEmu32.Y)); + mxShape->setSize(Size(aShapeRectEmu32.Width, aShapeRectEmu32.Height)); basegfx::B2DHomMatrix aTransformation; if ( !bIsShapeVisible) mxShape->setHidden(true); - mxShape->addShape( getOoxFilter(), &getTheme(), mxDrawPage, aTransformation, mxShape->getFillProperties(), &aShapeRectEmu32 ); + mxShape->addShape( getOoxFilter(), &getTheme(), mxDrawPage, aTransformation, mxShape->getFillProperties() ); /* Collect all shape positions in the WorksheetHelper base class. But first, scale EMUs to 1/100 mm. */ Rectangle aShapeRectHmm( - convertEmuToHmm( aShapeRectEmu.X ), convertEmuToHmm( aShapeRectEmu.Y ), - convertEmuToHmm( aShapeRectEmu.Width ), convertEmuToHmm( aShapeRectEmu.Height ) ); + convertEmuToHmm(aShapeRectEmu32.X ), convertEmuToHmm(aShapeRectEmu32.Y ), + convertEmuToHmm(aShapeRectEmu32.Width ), convertEmuToHmm(aShapeRectEmu32.Height ) ); extendShapeBoundingBox( aShapeRectHmm ); // set cell Anchoring if ( mxAnchor->getEditAs() != ShapeAnchor::ANCHOR_ABSOLUTE ) |