diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-10-25 01:51:25 +0000 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-10-25 00:37:25 +0000 |
| commit | f7c61b08d526c79ecd1522dff79386059b6125e0 (patch) | |
| tree | 496c9960e02bb0ded01d8ab9ecd0faf8c2ec2620 /include | |
| parent | 419e4fa1b587c1e4bc3f8d48729e1955ade1c8c3 (diff) | |
tdf#103389: Resaving a DOCX document with two canvases leads to a broken file.
Make custom shape export more robust. In case of the test
document, WriteCustomGeometry is called, but this call
does not export anything, and so we get a shape without
any geometry in the DOCX file, which causes problem to MS Word.
Change-Id: Ie7a4e2b8a18bfddaeeb81425ae5f1de04140d43f
Reviewed-on: https://gerrit.libreoffice.org/30241
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index a880cd23d6c3..e9dc0a33c3fa 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -204,7 +204,7 @@ public: void WritePresetShape( const char* pShape , std::vector< std::pair<sal_Int32,sal_Int32>> & rAvList ); void WritePresetShape( const char* pShape ); void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const css::beans::PropertyValue& rProp ); - void WriteCustomGeometry( const css::uno::Reference<css::drawing::XShape>& rXShape ); + bool WriteCustomGeometry( const css::uno::Reference<css::drawing::XShape>& rXShape ); void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ); void WriteFill( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ); void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); |