summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorTünde Tóth <toth.tunde@nisz.hu>2021-07-02 14:19:16 +0200
committerLászló Németh <nemeth@numbertext.org>2021-07-13 18:23:43 +0200
commitd79de2a2975db6b34f47b7ccfe8d18692373d6f0 (patch)
tree0aba114efe5d50353b7e76e3e6fbc5403cd5a143 /sc/source
parent1115d4d5ac63394ca0f3f1b75dc81916cdbeebe9 (diff)
tdf#143068 XLSX: fix export of top10 filter condition
Top10 filter condition lost after XLSX export. Change-Id: I5f9974e7d73f9ada84e284790c2928547f9ec7e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118291 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/excel/excrecds.cxx16
1 files changed, 9 insertions, 7 deletions
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 8c66caebdea5..8ce820bb2389 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -809,7 +809,7 @@ void XclExpAutofilter::WriteBody( XclExpStream& rStrm )
void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
{
- if (meType == FilterCondition && !HasCondition())
+ if (meType == FilterCondition && !HasCondition() && !HasTop10())
return;
sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
@@ -833,12 +833,14 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
// OOXTODO: XML_filterVal
);
}
-
- rWorksheet->startElement( XML_customFilters,
- XML_and, ToPsz((nFlags & EXC_AFFLAG_ANDORMASK) == EXC_AFFLAG_AND) );
- aCond[ 0 ].SaveXml( rStrm );
- aCond[ 1 ].SaveXml( rStrm );
- rWorksheet->endElement( XML_customFilters );
+ else
+ {
+ rWorksheet->startElement(XML_customFilters, XML_and,
+ ToPsz((nFlags & EXC_AFFLAG_ANDORMASK) == EXC_AFFLAG_AND));
+ aCond[0].SaveXml(rStrm);
+ aCond[1].SaveXml(rStrm);
+ rWorksheet->endElement(XML_customFilters);
+ }
// OOXTODO: XML_dynamicFilter, XML_extLst, XML_filters, XML_iconFilter
}
break;