diff options
| author | Justin Luth <justin_luth@sil.org> | 2021-03-31 09:21:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-04-09 23:30:19 +0200 |
| commit | e5a17f9690cc775a84a4a7239179a1ad9c9cdf54 (patch) | |
| tree | 5e13d4049897992c5fac8ab4dce62537f4830316 /sc | |
| parent | f3c40912bb2731a0ec1d02357bd6375c875630b6 (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/+/113640
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index fc634e319549..86c4d1c5cde0 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1803,7 +1803,7 @@ void XclExpObjectManager::StartSheet() std::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const SdrPage* pSdrPage ) { if( pSdrPage ) - mxEscherEx->AddSdrPage( *pSdrPage ); + mxEscherEx->AddSdrPage( *pSdrPage, GetOutput() != EXC_OUTPUT_BINARY ); // the first dummy object may still be open OSL_ENSURE( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" ); while( mxEscherEx->GetGroupLevel() ) @@ -1815,7 +1815,7 @@ std::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const S std::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const Reference< XShapes >& rxShapes ) { if( rxShapes.is() ) - mxEscherEx->AddUnoShapes( rxShapes ); + mxEscherEx->AddUnoShapes( rxShapes, GetOutput() != EXC_OUTPUT_BINARY ); // the first dummy object may still be open OSL_ENSURE( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" ); while( mxEscherEx->GetGroupLevel() ) |