summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2021-05-10 00:47:13 +0200
committerMiklos Vajna <vmiklos@collabora.com>2021-05-11 17:19:34 +0200
commit36499d8bf6cd5c6af7b2ceb6071baf5c7421bd0a (patch)
tree6c4817b5f14c6286438f02e46ffbd2a067bad68b /include/oox
parent919260f73be652195d228d78ed519d46e59e6f8b (diff)
tdf#141463 avoid skew in shape group in ooxml import ..
and implement special resize handling for rotation angles larger 45deg. This solves tdf#93952 and tdf#141953 too. Change-Id: I798f6d2cea29c4a5285f530e9cf7bb10e7f6c41d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115296 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/drawingml/shape.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index eac27b68c7a5..53401d18a1c1 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -188,7 +188,7 @@ public:
const basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
ShapeIdMap* pShapeMap = nullptr,
- bool bInGroup = false);
+ oox::drawingml::ShapePtr pParentGroupShape = nullptr);
const css::uno::Reference< css::drawing::XShape > &
getXShape() const { return mxShape; }
@@ -265,7 +265,7 @@ protected:
bool bDoNotInsertEmptyTextBody,
basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
- bool bInGroup = false
+ oox::drawingml::ShapePtr pParentGroupShape = nullptr
);
void addChildren(