sc/source/filter/excel/excrecds.cxx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
New commits: commit 101fc9fea871c71813c541bd790962d0c06e5753 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Sep 7 09:31:46 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Sep 7 12:17:04 2020 +0200 crashtesting: failure on export of tdf123353-1.xlsx to xls since... commit 487df0c8f307500029b06c89985a1148ebc784b5 Date: Tue Sep 1 13:55:25 2020 +0200 tdf#123353 XLSX export: fix lost AutoFilter on empty cells Change-Id: I5ef156cd9fe371b0b04b9308a0aa0887ac57713f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102152 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 945748ba9dca..7e495d21b17e 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -650,11 +650,18 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) { const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems(); - if (GetOutput() != EXC_OUTPUT_BINARY && rItems.empty()) + if (rItems.empty()) { - meType = BlankValue; - return false; + if (GetOutput() != EXC_OUTPUT_BINARY) + { + // tdf#123353 XLSX export + meType = BlankValue; + return false; + } + // XLS export + return true; } + if (GetOutput() != EXC_OUTPUT_BINARY && rItems.size() > 1) { AddMultiValueEntry(rEntry); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
