This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 08f7511cfd71a6f64500c6bb31faa988ed6d1d91 Author: Jim Jagielski <[email protected]> AuthorDate: Tue Nov 3 07:27:02 2026 -0500 sc: leave out ODF 1.4 color conditions of filters instead of comparing the color as text --- main/sc/source/filter/xml/xmlfilti.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main/sc/source/filter/xml/xmlfilti.cxx b/main/sc/source/filter/xml/xmlfilti.cxx index d06d01046a..27d7f0c0b4 100644 --- a/main/sc/source/filter/xml/xmlfilti.cxx +++ b/main/sc/source/filter/xml/xmlfilti.cxx @@ -381,6 +381,9 @@ void ScXMLConditionContext::getOperatorXML(const rtl::OUString sTempOperator, sa void ScXMLConditionContext::EndElement() { + // ODF 1.4 colour conditions cannot be expressed here; reading the colour as text would filter everything out + if (sDataType.equalsAscii("text-color") || sDataType.equalsAscii("background-color")) + return; sheet::TableFilterField2 aFilterField; if (pFilterContext->GetConnection()) aFilterField.Connection = sheet::FilterConnection_OR; @@ -746,6 +749,8 @@ void ScXMLDPConditionContext::getOperatorXML(const rtl::OUString sTempOperator, void ScXMLDPConditionContext::EndElement() { + if (sDataType.equalsAscii("text-color") || sDataType.equalsAscii("background-color")) + return; ScQueryEntry aFilterField; if (pFilterContext->GetConnection()) aFilterField.eConnect = SC_OR;
