diff options
| author | Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com> | 2019-03-13 10:49:30 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-08 10:07:35 +0200 |
| commit | aafaf1f55fa413ad49d4556cf7c0a713dd206ae4 (patch) | |
| tree | 1cfe3368ee1aeec9fb45e081c89c7d59ecc1432f /include | |
| parent | 31ac398cfa30694b18240d31df17a58d699b5bf6 (diff) | |
PPTX export: save SmartArt as diagram instead of group of shapes
preserving SmartArt allows editing it in PowerPoint after saving as pptx file
* moved common parts for docx and pptx export to oox/drawingml
* fixed export tests that expected shapes on output
Change-Id: I3e70a9f4177bebf5e1671232f4cd0ef0e7212626
Reviewed-on: https://gerrit.libreoffice.org/69598
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index fbcc25fb3db1..b3cdbb3600ba 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -258,7 +258,12 @@ public: void WriteShape3DEffects( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); 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); + void writeDiagramRels(const css::uno::Sequence<css::uno::Sequence<css::uno::Any>>& xRelSeq, + const css::uno::Reference<css::io::XOutputStream>& xOutStream, + const OUString& sGrabBagProperyName, int nDiagramId); static bool IsGroupShape( const css::uno::Reference< css::drawing::XShape >& rXShape ); + static bool IsDiagram(const css::uno::Reference<css::drawing::XShape>& rXShape); sal_Int32 getBulletMarginIndentation (const css::uno::Reference< css::beans::XPropertySet >& rXPropSet,sal_Int16 nLevel, const OUString& propName); static void ResetCounters(); |