tdf#76258 Add OOXML import for color filter

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

2 files changed, 60 insertions, 3 deletions

diff --git a/offapi/com/sun/star/sheet/FilterFieldType.idl b/offapi/com/sun/star/sheet/FilterFieldType.idl
new file mode 100644
index 000000000000..0a5113c7a075
--- /dev/null
+++ b/offapi/com/sun/star/sheet/FilterFieldType.idl
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef __com_sun_star_sheet_FilterFieldType_idl__
+#define __com_sun_star_sheet_FilterFieldType_idl__
+
+module com {  module sun {  module star {  module sheet {
+
+/**
+ * @since LibreOffice 7.2
+ */
+constants FilterFieldType
+{
+   /** Filter by numeric value */
+   const short NUMERIC = 0;
+
+   /** Filter by string value */
+   const short STRING = 1;
+
+   /** Filter by date */
+   const short DATE = 2;
+
+   /** Filter by text color */
+   const short TEXT_COLOR = 3;
+
+   /** Filter by background color */
+   const short BACKGROUND_COLOR = 4;
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/FilterFieldValue.idl b/offapi/com/sun/star/sheet/FilterFieldValue.idl
index 2e3ba927dc97..12e9b8ba62e8 100644
--- a/offapi/com/sun/star/sheet/FilterFieldValue.idl
+++ b/offapi/com/sun/star/sheet/FilterFieldValue.idl
@@ -19,6 +19,8 @@ struct FilterFieldValue
 {
     /** selects whether the TableFilterFieldValue::NumericValue
         or the TableFilterFieldValue::StringValue is used.
+
+        @deprecated - Use FilterType instead.
      */
     boolean IsNumeric;
 
@@ -30,12 +32,27 @@ struct FilterFieldValue
      */
     string StringValue;
 
-    /** specifies whether the TableFilterFieldValue::StringValue
-        is a string value or a date value.
+    /** Which field should be used for filtering:
+
+        <ul>
+            <li>com::sun::star::sheet::FilterFieldType::NUMERIC -> NumericValue</li>
+            <li>com::sun::star::sheet::FilterFieldType::STRING -> StringValue</li>
+            <li>com::sun::star::sheet::FilterFieldType::DATE -> StringValue</li>
+            <li>com::sun::star::sheet::FilterFieldType::TEXT_COLOR -> ColorValue</li>
+            <li>com::sun::star::sheet::FilterFieldType::BACKGROUND_COLOR -> ColorValue</li>
+        </ul>
 
+        @see com::sun::star::sheet::FilterFieldType
         @since LibreOffice 7.2
      */
-    boolean IsDateValue;
+    short FilterType;
+
+    /** The color which is used for filtering
+
+        @since LibreOffice 7.2
+     */
+    com::sun::star::util::Color ColorValue;
+
 };
 
 }; }; }; };