diff options
| author | Paul Trojahn <paul.trojahn@gmail.com> | 2017-09-08 19:05:19 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-09-16 17:14:38 +0200 |
| commit | 33a6eb3df861009d0fe9ffee344ef00cd2906520 (patch) | |
| tree | 17dec3fc32d3ab9618f38a722860ad2923fe8b0b /include/oox | |
| parent | 57d3c7883bc51e9aed5b4eb8f2c2d599741888ca (diff) | |
tdf#100065 PPTX Fix import of custom shapes in groups
A negative scale of the parent matrix indicates that the shape needs to
be flipped. This commit fixes text rotation as well, so
d742c0019435d0bc90c9342492583636099a057f is no longer needed.
Change-Id: I67bba34519b3af9215fe64a71f5137aa510edf7a
Reviewed-on: https://gerrit.libreoffice.org/42250
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 7c3a8934e42a..6028a11c2bc0 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -139,7 +139,6 @@ public: sal_Int32 getRotation() const { return mnRotation; } void setDiagramRotation( sal_Int32 nRotation ) { mnDiagramRotation = nRotation; } void setFlip( bool bFlipH, bool bFlipV ) { mbFlipH = bFlipH; mbFlipV = bFlipV; } - void applyParentTextFlipV(bool bTextFlipV) { mbInheritedTextFlipV = bTextFlipV; } void addChild( const ShapePtr& rChildPtr ) { maChildren.push_back( rChildPtr ); } std::vector< ShapePtr >& getChildren() { return maChildren; } @@ -317,7 +316,6 @@ private: sal_Int32 mnDiagramRotation; // rotates shape prior to sizing, does not affect text rotation bool mbFlipH; bool mbFlipV; - bool mbInheritedTextFlipV; // Used by group shapes only bool mbHidden; bool mbHiddenMasterShape; // master shapes can be hidden in layout slides // we need separate flag because we don't want |