Use Aplication User Model IDs for the native file types

Change-Id: I4941d97a8eb540bbf63320db83230707ced9f90f

6 files changed, 176 insertions, 0 deletions

diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index fce66e8978dc..e763fd30d330 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -94,6 +94,14 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,11";
 End
 
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = "opendocument.DatabaseDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Base";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odb_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 082460844952..08dfece3d996 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -286,6 +286,14 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,3";
 End
 
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -383,6 +391,14 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,4";
 End
 
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarCalcTemplate.6\shell";
@@ -672,6 +688,14 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,3";
 End
 
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "opendocument.CalcDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ods_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -881,6 +905,14 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,4";
 End
 
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "opendocument.CalcTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 5357146a00ae..c461a4f91c02 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -286,6 +286,14 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,5";
 End
 
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -383,6 +391,14 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,6";
 End
 
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarDrawTemplate.6\shell";
@@ -671,6 +687,14 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,5";
 End
 
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "opendocument.DrawDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -880,6 +904,14 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,6";
 End
 
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "opendocument.DrawTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_otg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index f18cbab7efc6..01bfb649f6b6 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -286,6 +286,14 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,7";
 End
 
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -397,6 +405,14 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,8";
 End
 
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressTemplate.6\shell";
@@ -686,6 +702,14 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,7";
 End
 
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "opendocument.ImpressDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -909,6 +933,14 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,8";
 End
 
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "opendocument.ImpressTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_otp_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index be6354ef6e1c..5e8032958ca1 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -285,6 +285,14 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,12";
 End
 
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Math";
+End
+
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -545,6 +553,14 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,12";
 End
 
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "opendocument.MathDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Math";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odf_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 9871a6723894..4ba855aca278 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -286,6 +286,14 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,1";
 End
 
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -390,6 +398,14 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,9";
 End
 
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.6\shell";
@@ -460,6 +476,14 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Defaulticon
     Value = "<progpath>\program\soffice.bin,2";
 End
 
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -803,6 +827,14 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,1";
 End
 
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "opendocument.WriterDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -1035,6 +1067,14 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,2";
 End
 
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "opendocument.WriterTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ott_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1169,6 +1209,14 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,9";
 End
 
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "opendocument.WriterGlobalDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odm_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1303,6 +1351,14 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
     Value = "<progpath>\program\soffice.bin,10";
 End
 
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "opendocument.WriterWebTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterWebTemplate.1\shell";