diff options
author | Balazs Varga <balazs.varga991@gmail.com> | 2021-08-25 14:40:24 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2021-09-01 10:31:54 +0200 |
commit | 9fbe0a171ece07da0d5c1e16eae23a167cb81114 (patch) | |
tree | 4ee35708516fbc1cb8489182a2139e78f338b023 /include/oox/export/shapes.hxx | |
parent | 504d78acb866495fd954fcd6db22ea68f174a5ab (diff) |
tdf#143127 tdf#143130 ooxml export: fix lost image/shape in chart
tdf#143127: Add officeRel namespace to XML_userShapes
to fix invalid file error in MSO.
tdf#143130: Add mbUserShapes variable to ShapeExport class
to fix export of embedded shapes of charts in DOCX.
Change-Id: I10c1dbf905af96d6a63a9243514b32a6440e63f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121035
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/oox/export/shapes.hxx')
-rw-r--r-- | include/oox/export/shapes.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index 3e9bf364d400..0f4e264fb1b6 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -87,6 +87,7 @@ public: protected: sal_Int32 mnShapeIdMax; + bool mbUserShapes; // for chart's embedded usershapes void WriteGraphicObjectShapePart( const css::uno::Reference< css::drawing::XShape >& xShape, const Graphic *pGraphic=nullptr ); @@ -107,7 +108,8 @@ public: ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ShapeHashMap* pShapeMap, ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType = DOCUMENT_PPTX, - DMLTextExport* pTextExport = nullptr ); + DMLTextExport* pTextExport = nullptr, + bool bUserShapes = false ); virtual ~ShapeExport() {} void SetURLTranslator(const std::shared_ptr<URLTransformer>& pTransformer); |