[Libreoffice-commits] core.git: scp2/source solenv/bin

[Julien Nabet (via logerrit)]

 scp2/source/calc/registryitem_calc.scp           |    1 +
 scp2/source/calc/registryitem_calc.ulf           |    3 +++
 solenv/bin/modules/installer/windows/property.pm |    1 +
 3 files changed, 5 insertions(+)

New commits:
commit e7b1f93cd681e2d0094f5937f4132aa4e780ab9e
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun May 28 20:36:40 2023 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Jun 4 14:31:23 2023 +0200

    tdf#71096: xlr filetype not associated with Calc in Windows
    
    Change-Id: Ifb9f74f2bd1532ebf364a3d554d303c1209393cd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152360
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index 7e9dd8e8d488..b6cf9c3df5c3 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1252,6 +1252,7 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
 
 // registering the mso file types
 
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlr, gid_Module_Prg_Calc_MSO_Reg, xlr, 
XLR, MS_WORKS, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  
XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, 
XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, 
XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
diff --git a/scp2/source/calc/registryitem_calc.ulf 
b/scp2/source/calc/registryitem_calc.ulf
index e12714de682d..d3f7efbb14aa 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -54,3 +54,6 @@ en-US = "Lotus Quattro Pro Spreadsheet"
 
 [STR_REG_VAL_NUMBERS_SPREADSHEET]
 en-US = "Apple Numbers"
+
+[STR_REG_VAL_MS_WORKS]
+en-US = "Microsoft Works Spreadsheet with Excel format"
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 60300e49ff58..701086af3a66 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -375,6 +375,7 @@ sub set_ms_file_types_properties
     push(@{$propertyfile}, "REGISTER_DOTM" . "\t" . "0" . "\n");
     push(@{$propertyfile}, "REGISTER_RTF"  . "\t" . "0" . "\n");
 
+    push(@{$propertyfile}, "REGISTER_XLR"  . "\t" . "0" . "\n");
     push(@{$propertyfile}, "REGISTER_XLS"  . "\t" . "0" . "\n");
     push(@{$propertyfile}, "REGISTER_XLSX" . "\t" . "0" . "\n");
     push(@{$propertyfile}, "REGISTER_XLSM" . "\t" . "0" . "\n");