diff options
author | Sarper Akdemir <sarper.akdemir@collabora.com> | 2022-01-03 05:45:17 +0300 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2022-01-05 09:08:10 +0100 |
commit | 8bdd134bef3baca2ebd878163af4e55e5f898efe (patch) | |
tree | 1552abfbed0247a9abe1bffb3108eaa98e8a9e63 /include/oox | |
parent | 678af723a6c0c26f20607532eec4e8a8208234bc (diff) |
tdf#146534 pptx import: make Z rotation work with rotation transform
Expands previous idea from a9c5c0d814a266096483572b84c72875ef8efd77
(tdf#133037 OOXML shape import: camera rotation along Z)
and uses it also for shapes that have a true bUseRotationTransform flag
Also fixes same Z rotation exporting twice from InteropGrabBag to
both spPr and textBody causing text overrotating on roundtrip.
Change-Id: If0f192af029ca86b932a63613f961be1f5003c5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127880
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/export/drawingml.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index eb1da4a61f8e..2a65818b15f6 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -323,7 +323,11 @@ public: void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteShapeEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteShapeEffect( std::u16string_view sName, const css::uno::Sequence< css::beans::PropertyValue >& aEffectProps ); - void WriteShape3DEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); + /** Populates scene3d tag + @param rXPropSet Prop set + @param bIsText True if the 3D effects are for a text body, false if it is for a shape + */ + void Write3DEffects(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet, bool bIsText); void WriteArtisticEffect( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); OString WriteWdpPicture( const OUString& rFileId, const css::uno::Sequence< sal_Int8 >& rPictureData ); void WriteDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape, int nDiagramId); |