filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu | 2 +- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu | 2 +- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu | 2 +- filter/source/config/fragments/filters/calc_OOXML.xcu | 4 ++-- filter/source/config/fragments/filters/calc_OOXML_Template.xcu | 4 ++-- filter/source/config/fragments/types/MS_Excel_2007_VBA_XML.xcu | 2 +- filter/source/config/fragments/types/MS_Excel_2007_XML.xcu | 2 +- filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu | 2 +- filter/source/config/fragments/types/calc_OOXML.xcu | 2 +- filter/source/config/fragments/types/calc_OOXML_Template.xcu | 2 +- sc/qa/uitest/calc_tests7/save_readonly_with_password.py | 2 +- sc/qa/uitest/calc_tests8/tdf147086_do_not_save_empty_password_OOXML.py | 2 +- sc/source/filter/xml/xmlimprt.cxx | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit ed23d7245e3a42b63decbc06f9bf39c2809f67cb Author: Justin Luth <[email protected]> AuthorDate: Sat Nov 29 14:00:15 2025 -0500 Commit: Justin Luth <[email protected]> CommitDate: Thu Dec 18 16:52:49 2025 +0100 tdf#165180 filter: rename XLSX filters to be less confusing This patch is basically a copy/paste of mstahl's DOCX patch LO 7.6 commit ed0476b0625c4361df5ff040a6661a9634588cea tdf#137883 filter: rename DOCX filters to be less confusing Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147210 Rename misleading "Excel 2007-365" filter which corresponds to the first pre-ISO version of OOXML (ECMA-365 1st edition) and is actually very specifically for Excel 2007. Stop confusing users with standardese like "Office Open XML Spreadsheet" and instead use the name of the appliction that the format is intended for, "Excel 2010–365". Hopefully users will now pick the latter filter over the former, although obviously it hasn't been highly tested in the wild... Also, the OOXML_Spreadsheet_Template was missing EXPORT flag, so didn't show up in the Save dialog. Also, the OOXML_Spreadsheet was missing SUPPORTSSIGNING flag which (for DOCX) vmiklos said was by accident. Notes: -I made sure to use the n-dash instead of a hyphen -did a diff to verify only missing EXPORT and SUPPORTSSIGNING -followup commit will make this default, so I already changed the corresponding unit tests to use 2010 filter. make -srj1 UITest_calc_tests7 \ UITEST_TEST_NAME=save_readonly_with_password.save_readonly_with_password.test_save_to_xlsx \ SAL_USE_VCLPLUGIN=gen make -srj1 UITest_calc_tests8 \ UITEST_TEST_NAME=tdf147086_do_not_save_empty_password_OOXML.tdf147086.test_tdf147086 \ SAL_USE_VCLPLUGIN=gen Change-Id: I66d8029f28e96552c291edc532f01ec9cb695763 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195032 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195524 diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu index ffeee2c630da..776bdd25afcb 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_VBA_XML.xcu @@ -25,6 +25,6 @@ <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIName"> - <value xml:lang="en-US">Excel 2007–365 (macro-enabled)</value> + <value xml:lang="en-US">Excel 2007 (macro-enabled)</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu index bc0ab95e2c8a..988cbeff75ad 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu @@ -25,6 +25,6 @@ <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIName"> - <value xml:lang="en-US">Excel 2007–365</value> + <value xml:lang="en-US">Excel 2007</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu index 515b89152b60..119b536ea8a1 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu @@ -25,6 +25,6 @@ <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIName"> - <value xml:lang="en-US">Excel 2007–365 Template</value> + <value xml:lang="en-US">Excel 2007 Template</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/calc_OOXML.xcu b/filter/source/config/fragments/filters/calc_OOXML.xcu index 2bc0981297d9..fbd3b2abaf7c 100644 --- a/filter/source/config/fragments/filters/calc_OOXML.xcu +++ b/filter/source/config/fragments/filters/calc_OOXML.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Calc Office Open XML" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED ENCRYPTION PASSWORDTOMODIFY</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED ENCRYPTION PASSWORDTOMODIFY SUPPORTSSIGNING</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop> <prop oor:name="UserData"><value>OOXML</value></prop> @@ -25,6 +25,6 @@ <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIName"> - <value xml:lang="en-US">Office Open XML Spreadsheet</value> + <value xml:lang="en-US">Excel 2010–365 Spreadsheet</value> </prop> </node> diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu index b65a756088be..c6dc4732dcb8 100644 --- a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu +++ b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Calc Office Open XML Template" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop> <prop oor:name="UserData"><value>OOXML</value></prop> @@ -25,6 +25,6 @@ <prop oor:name="TemplateName"/> <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> <prop oor:name="UIName"> - <value xml:lang="en-US">Office Open XML Spreadsheet Template</value> + <value xml:lang="en-US">Excel 2010–365 Template</value> </prop> </node> diff --git a/filter/source/config/fragments/types/MS_Excel_2007_VBA_XML.xcu b/filter/source/config/fragments/types/MS_Excel_2007_VBA_XML.xcu index 70c99bbf7dbd..c26dab582711 100644 --- a/filter/source/config/fragments/types/MS_Excel_2007_VBA_XML.xcu +++ b/filter/source/config/fragments/types/MS_Excel_2007_VBA_XML.xcu @@ -22,6 +22,6 @@ <prop oor:name="MediaType"><value>application/vnd.ms-excel.sheet.macroEnabled.12</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 VBA XML</value></prop> - <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Excel 2007–365 VBA XML</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Excel 2007 VBA XML</value></prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu b/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu index 73d2daee354c..a6c06c34a4ac 100644 --- a/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu +++ b/filter/source/config/fragments/types/MS_Excel_2007_XML.xcu @@ -22,6 +22,6 @@ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 XML</value></prop> - <prop oor:name="UIName"><value xml:lang="en-US">Excel 2007–365</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Excel 2007</value></prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu index d0a828def722..db6849e29b25 100644 --- a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu +++ b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu @@ -22,6 +22,6 @@ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.template</value></prop> <prop oor:name="Preferred"><value>false</value></prop> <prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 XML Template</value></prop> - <prop oor:name="UIName"><value xml:lang="en-US">Excel 2007–365 Template</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Excel 2007 Template</value></prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/filter/source/config/fragments/types/calc_OOXML.xcu b/filter/source/config/fragments/types/calc_OOXML.xcu index 8e2b073ccc3a..2dce88af0c22 100644 --- a/filter/source/config/fragments/types/calc_OOXML.xcu +++ b/filter/source/config/fragments/types/calc_OOXML.xcu @@ -22,6 +22,6 @@ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</value></prop> <prop oor:name="Preferred"><value>true</value></prop> <prop oor:name="PreferredFilter"><value>Calc Office Open XML</value></prop> - <prop oor:name="UIName"><value xml:lang="en-US">Office Open XML Spreadsheet</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Excel 2010–365 Spreadsheet</value></prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/filter/source/config/fragments/types/calc_OOXML_Template.xcu b/filter/source/config/fragments/types/calc_OOXML_Template.xcu index 1d002d08f143..566ce55f443b 100644 --- a/filter/source/config/fragments/types/calc_OOXML_Template.xcu +++ b/filter/source/config/fragments/types/calc_OOXML_Template.xcu @@ -22,6 +22,6 @@ <prop oor:name="MediaType"><value>application/vnd.openxmlformats-officedocument.spreadsheetml.template</value></prop> <prop oor:name="Preferred"><value>true</value></prop> <prop oor:name="PreferredFilter"><value>Calc Office Open XML Template</value></prop> - <prop oor:name="UIName"><value xml:lang="en-US">Office Open XML Spreadsheet Template</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Excel 2010–365 Spreadsheet Template</value></prop> <prop oor:name="ClipboardFormat"/> </node> diff --git a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py index 211060822f88..add5890cc325 100644 --- a/sc/qa/uitest/calc_tests7/save_readonly_with_password.py +++ b/sc/qa/uitest/calc_tests7/save_readonly_with_password.py @@ -29,7 +29,7 @@ class save_readonly_with_password(UITestCase): xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": xFilePath})) xFileTypeCombo = xSaveDialog.getChild("file_type") - select_by_text(xFileTypeCombo, "Excel 2007–365 (.xlsx)") + select_by_text(xFileTypeCombo, "Excel 2010–365 Spreadsheet (.xlsx)") xPasswordCheckButton = xSaveDialog.getChild("password") xPasswordCheckButton.executeAction("CLICK", tuple()) xOpen = xSaveDialog.getChild("open") diff --git a/sc/qa/uitest/calc_tests8/tdf147086_do_not_save_empty_password_OOXML.py b/sc/qa/uitest/calc_tests8/tdf147086_do_not_save_empty_password_OOXML.py index 85c7eb42e408..d2144c80d566 100755 --- a/sc/qa/uitest/calc_tests8/tdf147086_do_not_save_empty_password_OOXML.py +++ b/sc/qa/uitest/calc_tests8/tdf147086_do_not_save_empty_password_OOXML.py @@ -31,7 +31,7 @@ class tdf147086(UITestCase): xFileName.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": xFilePath})) xFileTypeCombo = xSaveDialog.getChild("file_type") - select_by_text(xFileTypeCombo, "Excel 2007–365 (.xlsx)") + select_by_text(xFileTypeCombo, "Excel 2010–365 Spreadsheet (.xlsx)") xPasswordCheckButton = xSaveDialog.getChild("password") xPasswordCheckButton.executeAction("CLICK", tuple()) xOpen = xSaveDialog.getChild("open") diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 501deb66de35..dd4fc2e27a1d 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1789,7 +1789,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestFODSExportXLS(SvStream &rStream) uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence({ })); uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence({ - { "FilterName", uno::Any(u"Excel 2007–365"_ustr) }, + { "FilterName", uno::Any(u"Excel 2010–365 Spreadsheet"_ustr) }, { "OutputStream", uno::Any(xOutputStream) }, { "FilterData", uno::Any(aFilterData) } }));
