diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-03-31 09:21:45 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-06 12:49:14 +0200 |
| commit | babd187dfaa5181ddaec6612fb8efe12ac8ed350 (patch) | |
| tree | 1ac23625155d66b305869c38c7e9bae4e9cf55d9 /include | |
| parent | 38e062c3d842f17d7361d46d11e3ee355905988f (diff) | |
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 <justin_luth@sil.org>
(cherry picked from commit a3c5c0f7ce73001adab7475fde1f8ffec4eef48b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113484
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 4d63b046679539c1e0f5a6f44e87c9420d679f5b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113638
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 9acfb51bd892..7dc236e7e5d0 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1159,8 +1159,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 ); |