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

[Libreoffice Gerrit user]

 scp2/source/calc/registryitem_calc.scp       |   18 ++++++++++++++++++
 scp2/source/impress/registryitem_impress.scp |   26 ++++++++++++++++++++++++++
 scp2/source/writer/registryitem_writer.scp   |   18 ++++++++++++++++++
 3 files changed, 62 insertions(+)

New commits:
commit 39b39f124a2bd6abe62e30bacac5d1326495d862
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Dec 22 01:41:55 2018 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Dec 22 06:17:15 2018 +0100

    tdf#122266: Register default extensions for OOXML content types
    
    This allows Windows/applications to pick OOXML editors (and thus
    LibreOffice) when they lookup by content type, not by extension.
    
    Change-Id: I0daca12f735035e6fc39484b5c788af37b81b575
    Reviewed-on: https://gerrit.libreoffice.org/65563
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 7464e701ca7c..a48a194522ed 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1263,6 +1263,24 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, x
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
 
+// Registering OOXML MIME content types, to allow OS/applications to redirect such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Xlsx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+    Name = "Extension";
+    Value = ".xlsx";
+End
+
+RegistryItem gid_Regitem_Xltx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.spreadsheetml.template";
+    Name = "Extension";
+    Value = ".xltx";
+End
+
 // registering other supported types
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uos, gid_Module_Prg_Calc_Other_Reg, uos, UOS, UNIFORM_OFFICE_FORMAT_SPREADSHEET, 3, scalc.exe, open, Calc )
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 295f0b432ea0..be9ba5fea5b9 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -1110,6 +1110,32 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
 
+// Registering OOXML MIME content types, to allow OS/applications to redirect such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Pptx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.presentationml.presentation";
+    Name = "Extension";
+    Value = ".pptx";
+End
+
+RegistryItem gid_Regitem_Ppsx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.presentationml.slideshow";
+    Name = "Extension";
+    Value = ".ppsx";
+End
+
+RegistryItem gid_Regitem_Potx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.presentationml.template";
+    Name = "Extension";
+    Value = ".potx";
+End
+
 // registering other supported types
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uop, gid_Module_Prg_Impress_Other_Reg, uop, UOP, UNIFORM_OFFICE_FORMAT_PRESENTATION, 7, simpress.exe, open, Impress )
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 7eb628a51721..98859a881836 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1740,6 +1740,24 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, do
 CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
 CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
 
+// Registering OOXML MIME content types, to allow OS/applications to redirect such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Docx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+    Name = "Extension";
+    Value = ".docx";
+End
+
+RegistryItem gid_Regitem_Dotx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.wordprocessingml.template";
+    Name = "Extension";
+    Value = ".dotx";
+End
+
 // registering other supported types
 
 CONDITIONAL_REGISTER_DOC_EXTENSION( Uot,  gid_Module_Prg_Wrt_Other_Reg, uot,  UOT,  UNIFORM_OFFICE_FORMAT_TEXT, 1, swriter.exe, open, Writer )