tdf#142965 color filter: allow filtering by no fill/automatic color

Change-Id: Idd0a41cea936fd19adbc07561b0d9c0cba735f0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120946
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

1 files changed, 27 insertions, 8 deletions

diff --git a/sc/qa/unit/subsequent_export_test2.cxx b/sc/qa/unit/subsequent_export_test2.cxx
index a25babe59134..12863985d79e 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -725,15 +725,34 @@ void ScExportTest2::testAutofilterColorsODF()
         = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, "content.xml", FORMAT_ODS);
     CPPUNIT_ASSERT(pDoc);
 
-    assertXPath(pDoc, "//table:filter/table:filter-and/table:filter-condition[1]", "value",
-                "#e8f2a1");
-    assertXPath(pDoc, "//table:filter/table:filter-and/"
+    assertXPath(pDoc,
+                "//table:database-ranges/table:database-range[1]/table:filter/table:filter-and/"
+                "table:filter-condition[1]",
+                "value", "#e8f2a1");
+    assertXPath(pDoc,
+                "//table:database-ranges/table:database-range[1]/table:filter/table:filter-and/"
+                "table:filter-condition[1][@loext:data-type='background-color']");
+    assertXPath(pDoc,
+                "//table:database-ranges/table:database-range[1]/table:filter/table:filter-and/"
+                "table:filter-condition[2]",
+                "value", "#3465a4");
+    assertXPath(pDoc, "//table:database-ranges/table:database-range[1]/table:filter/"
+                      "table:filter-and/table:filter-condition[2][@loext:data-type='text-color']");
+
+    // tdf#142965 Check "none" value when automatic text color / no fill was selected
+    assertXPath(pDoc, "//table:database-ranges/table:database-range[2]/table:filter/"
+                      "table:filter-and/"
                       "table:filter-condition[1][@loext:data-type='background-color']");
-    assertXPath(pDoc, "//table:filter/table:filter-and/table:filter-condition[2]", "value",
-                "#3465a4");
-    assertXPath(
-        pDoc,
-        "//table:filter/table:filter-and/table:filter-condition[2][@loext:data-type='text-color']");
+    assertXPath(pDoc,
+                "//table:database-ranges/table:database-range[2]/table:filter/table:filter-and/"
+                "table:filter-condition[1]",
+                "value", "transparent");
+    assertXPath(pDoc, "//table:database-ranges/table:database-range[3]/table:filter/"
+                      "table:filter-and/table:filter-condition[1][@loext:data-type='text-color']");
+    assertXPath(pDoc,
+                "//table:database-ranges/table:database-range[3]/table:filter/table:filter-and/"
+                "table:filter-condition[1]",
+                "value", "window-font-color");
 }
 
 void ScExportTest2::testAutofilterColorsOOXML()