From a3c5c0f7ce73001adab7475fde1f8ffec4eef48b Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 31 Mar 2021 09:21:45 +0200 Subject: tdf#139786 partial revert tdf#106181 XLSX export: output form controls Not every export is going to be to OOXML format, so don't just set ooxmlexport to true and remove the "if" clause (especially when leaving the comment that this is for DOCX only). This is a partial revert to 7.1 (and backported to 6.4.5) commit 577dd32b1c4eb0a4cff574fbabca987cb52b831b. Change-Id: If7ea32a236715ec779cac302773c4c9da19865a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113399 Tested-by: Jenkins Reviewed-by: Justin Luth --- include/filter/msfilter/escherex.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index f55074ecf856..9ab3d891da2a 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1158,8 +1158,8 @@ public: // ...Sdr... implemented in eschesdo.cxx - void AddSdrPage( const SdrPage& rPage ); - void AddUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes ); + void AddSdrPage( const SdrPage& rPage, bool ooxmlExport = false ); + void AddUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes, bool ooxmlExport = false ); /// returns the ShapeID sal_uInt32 AddSdrObject( const SdrObject& rObj, bool ooxmlExport = false ); -- cgit