diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-07-29 21:43:41 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-08-04 12:01:29 +0200 |
commit | 72e3148f50af7dd85c489c7bf641963a3194cab6 (patch) | |
tree | 0c19693eedd5dac67f5d0edb77c06a49ee9dccad /include | |
parent | 281b2c65b32dfcc312f4e662e33f73a867aa75f0 (diff) |
tdf#109223: PPTX: Vertical flip of child shape is not imported correctly
Group shape level vertical flip is not handled well. Recent handling
of group shape's transformation makes it hard to import this attribute,
but we can import the right text direction at least.
Reviewed-on: https://gerrit.libreoffice.org/40554
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit d742c0019435d0bc90c9342492583636099a057f)
Change-Id: Ib9e39e3dcb28a95fabc61c13152a3f7296fbd4c3
Reviewed-on: https://gerrit.libreoffice.org/40556
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c49f2c00067cbe5de714525807290b71aec57ea3)
Diffstat (limited to 'include')
-rw-r--r-- | include/oox/drawingml/shape.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 67f9a9b48afd..b7f1d162d7bb 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -138,6 +138,7 @@ public: void setRotation( sal_Int32 nRotation ) { mnRotation = 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; } @@ -315,6 +316,7 @@ private: sal_Int32 mnRotation; 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 |