desktop/source/lib/init.cxx                                     |    2 +-
 officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d782d6fb57a78aa6d67c5adb3adf45c4db6b0ddb
Author:     Justin Luth <[email protected]>
AuthorDate: Sat Nov 29 16:06:52 2025 -0500
Commit:     Justin Luth <[email protected]>
CommitDate: Fri Dec 12 00:44:17 2025 +0100

    tdf#165180 xlsx UI: prefer Excel 2010–365 Spreadsheet, not 2007
    
    A prior commit in this patchset
    clarified what "Calc Office Open XML" is targeted for.
    
    Probably it is time for us to intentionally target the 2010+ format...
    
    However, this does not yet result in the right filter
    being chosen for round-tripping an xlsx file...
    
    Change-Id: Ia4dc82bd55aecb24854eba66dc0c77a214d251a8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195034
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <[email protected]>

diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu 
b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
index 7ccb01532d03..f8dc51a005d0 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/UISort.xcu
@@ -21,7 +21,7 @@
   <node oor:name="ModuleDependendFilterOrder">
     <node oor:name="com.sun.star.sheet.SpreadsheetDocument" oor:op="replace" 
install:module="calc">
       <prop oor:name="SortedFilterList">
-        <value oor:separator=";">calc8;calc8_template;StarOffice XML 
(Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF 
spreadsheet;Calc MS Excel 2007 XML;Calc MS Excel 2007 XML Template;Calc MS 
Excel 2007 Binary;MS Excel 2003 XML;MS Excel 97;MS Excel 97 Vorlage/Template;MS 
Excel 95;MS Excel 95 Vorlage/Template;MS Excel 5.0/95;MS Excel 5.0/95 
Vorlage/Template;MS Excel 4.0;MS Excel 4.0 Vorlage/Template;;DIF;dBase;HTML 
(StarCalc);Lotus;Pocket Excel;Quattro Pro 6.0;Rich Text Format 
(StarCalc);SYLK;Text - txt - csv (StarCalc);calc_HTML_WebQuery;Calc Office Open 
XML;Calc Office Open XML Template;ADO Rowset XML</value>
+        <value oor:separator=";">calc8;calc8_template;StarOffice XML 
(Calc);calc_StarOffice_XML_Calc_Template;OpenDocument Spreadsheet Flat XML;UOF 
spreadsheet;Calc Office Open XML;Calc Office Open XML Template;;MS Excel 97;MS 
Excel 97 Vorlage/Template;MS Excel 95;MS Excel 95 Vorlage/Template;MS Excel 
5.0/95;MS Excel 5.0/95 Vorlage/Template;MS Excel 4.0;MS Excel 4.0 
Vorlage/Template;;DIF;dBase;HTML (StarCalc);Lotus;Pocket Excel;Quattro Pro 
6.0;Rich Text Format (StarCalc);SYLK;Text - txt - csv 
(StarCalc);calc_HTML_WebQuery;ADO Rowset XML;Calc MS Excel 2007 XML;Calc MS 
Excel 2007 XML Template;Calc MS Excel 2007 Binary;Calc MS Excel 2007 VBA XML;MS 
Excel 2003 XML</value>
       </prop>
     </node>
     <node oor:name="com.sun.star.drawing.DrawingDocument" oor:op="replace" 
install:module="draw">
commit ac118e868bea785c344554cc4ab0955608671d9c
Author:     Justin Luth <[email protected]>
AuthorDate: Sat Nov 29 16:40:18 2025 -0500
Commit:     Justin Luth <[email protected]>
CommitDate: Fri Dec 12 00:44:08 2025 +0100

    tdf#165180 xlsx LOKit: prefer Excel 2010–365 Spreadsheet, not 2007
    
    A prior commit in this patchset
    clarified what "Calc Office Open XML" is targeted for.
    
    Probably it is time for us to intentionally target the 2010+ format...
    
    Change-Id: I58bffb393f82d2ea667cded8c0a198217fc93cc8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195033
    Reviewed-by: Justin Luth <[email protected]>
    Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 24624b26ac9d..4d8207751382 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -356,7 +356,7 @@ constexpr ExtensionMap aCalcExtensionMap[] =
     { "xhtml", u"XHTML Calc File"_ustr },
     { "xls",   u"MS Excel 97"_ustr },
     { "xlsm",  u"Calc MS Excel 2007 VBA XML"_ustr },
-    { "xlsx",  u"Calc MS Excel 2007 XML"_ustr },
+    { "xlsx",  u"Calc Office Open XML"_ustr },
     { "png",   u"calc_png_Export"_ustr },
 };
 

Reply via email to