Make Win32 LibO installable side by side with other StarOffice derivatives

1 files changed, 83 insertions, 83 deletions

diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 791169170604..f29b5cb5a8cf 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -228,7 +228,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\ProgID";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Programmable
@@ -262,7 +262,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\VersionIndependentProgID";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
@@ -776,7 +776,7 @@ End
 RegistryItem gid_Regitem_WriterDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -784,7 +784,7 @@ RegistryItem gid_Regitem__Odt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
@@ -792,7 +792,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
     Styles = ();
 End
 
@@ -801,7 +801,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = "application/vnd.oasis.opendocument.text";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
     Styles = ();
 End
 
@@ -824,7 +824,7 @@ End
 RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".odt\opendocument.WriterDocument.1\ShellNew";
+    Subkey = ".odt\LibreOffice.WriterDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.odt";
 End
@@ -832,28 +832,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument\CurVer";
-    Value = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument\CurVer";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     REG_VALUE_LNG(OO_WRITER)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\CLSID";
+    Subkey = "LibreOffice.WriterDocument.1\CLSID";
     Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.bin,1";
 End
 
@@ -861,7 +861,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -869,7 +869,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WRITER)
 End
@@ -877,14 +877,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\Insertable";
+    Subkey = "LibreOffice.WriterDocument.1\Insertable";
 End
 
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odt_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterDocument.1";
+    Subkey = "LibreOffice.WriterDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -902,56 +902,56 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\server";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell";
+    Subkey = "LibreOffice.WriterDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\new";
+    Subkey = "LibreOffice.WriterDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\new\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\open\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\open\command";
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -959,14 +959,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\print\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -974,21 +974,21 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument\CurVer";
-    Value = "opendocument.WriterWebDocument.1";
+    Subkey = "LibreOffice.WriterWebDocument\CurVer";
+    Value = "LibreOffice.WriterWebDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument.1";
+    Subkey = "LibreOffice.WriterWebDocument.1";
     REG_VALUE_LNG(OO_WRITER)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebDocument.1\shell\open\command";
+    Subkey = "LibreOffice.WriterWebDocument.1\shell\open\command";
     Value = "\"<progpath>\program\sweb.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -1020,7 +1020,7 @@ RegistryItem gid_Regitem__Fodt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".fodt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
@@ -1028,7 +1028,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "LibreOffice.WriterDocument.1";
     Styles = (PATCH);
 End
 
@@ -1075,7 +1075,7 @@ End
 RegistryItem gid_Regitem_WriterTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1083,7 +1083,7 @@ RegistryItem gid_Regitem_Ott
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterTemplate.1";
+    Value = "LibreOffice.WriterTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ott_Contenttype
@@ -1096,14 +1096,14 @@ End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_WRITER_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,2";
 End
@@ -1112,7 +1112,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -1120,7 +1120,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WRITER_TEMPLATE)
 End
@@ -1129,7 +1129,7 @@ End
 RegistryItem gid_Regitem_ott_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterTemplate.1";
+    Subkey = "LibreOffice.WriterTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1147,41 +1147,41 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell";
+    Subkey = "LibreOffice.WriterTemplate.1\shell";
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell\new";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1212,7 +1212,7 @@ End
 RegistryItem gid_Regitem_WriterGlobalDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1220,7 +1220,7 @@ RegistryItem gid_Regitem_Odm
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".odm";
-    Value = "opendocument.WriterGlobalDocument.1";
+    Value = "LibreOffice.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Odm_Contenttype
@@ -1241,21 +1241,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument\CurVer";
+    Subkey = "LibreOffice.WriterGlobalDocument\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterGlobalDocument.1";
+    Value = "LibreOffice.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_MASTERDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,9";
 End
@@ -1264,7 +1264,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -1272,7 +1272,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_MASTERDOC)
 End
@@ -1281,7 +1281,7 @@ End
 RegistryItem gid_Regitem_odm_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterGlobalDocument.1";
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1298,42 +1298,42 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\new";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\new\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\print\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterGlobalDocument.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1364,7 +1364,7 @@ End
 RegistryItem gid_Regitem_WriterWebTemplate_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1372,7 +1372,7 @@ RegistryItem gid_Regitem_Oth
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".oth";
-    Value = "opendocument.WriterWebTemplate.1";
+    Value = "LibreOffice.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Oth_Contenttype
@@ -1393,21 +1393,21 @@ End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate\CurVer";
+    Subkey = "LibreOffice.WriterWebTemplate\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "opendocument.WriterWebTemplate.1";
+    Value = "LibreOffice.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_WEBDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
+    Subkey = "LibreOffice.WriterWebTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.bin,10";
 End
@@ -1416,7 +1416,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     ComponentCondition = "VersionNT >= 601";
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
 End
@@ -1424,49 +1424,49 @@ End
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_FriendlyTypeName
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     Name = "FriendlyTypeName";
     REG_VALUE_LNG(OO_WEBDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\new";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\new\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\print\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "opendocument.WriterWebTemplate.1\shell\printto\command";
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1475,7 +1475,7 @@ End
 RegistryItem gid_Regitem_oth_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.WriterWebTemplate.1";
+    Subkey = "LibreOffice.WriterWebTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -1497,7 +1497,7 @@ RegistryItem gid_Regitem_OpenOffice_ODT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "LibreOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1506,7 +1506,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterTemplate.1";
+    Name = "LibreOffice.WriterTemplate.1";
     Value = " ";
 End
 
@@ -1515,7 +1515,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".oth\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebTemplate.1";
+    Name = "LibreOffice.WriterWebTemplate.1";
     Value = " ";
 End
 
@@ -1524,7 +1524,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterGlobalDocument.1";
+    Name = "LibreOffice.WriterGlobalDocument.1";
     Value = " ";
 End
 
@@ -1596,7 +1596,7 @@ RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wps\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "LibreOffice.WriterDocument.1";
     Value = " ";
 End
 
@@ -1624,7 +1624,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
-    Value = "opendocument.WriterTemplate.1";
+    Value = "LibreOffice.WriterTemplate.1";
     Styles = ();
 End
 
@@ -1705,7 +1705,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
-    Value = "opendocument.WriterWebTemplate.1";
+    Value = "LibreOffice.WriterWebTemplate.1";
     Styles = ();
 End
 
@@ -1714,7 +1714,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
-    Value = "opendocument.WriterGlobalDocument.1";
+    Value = "LibreOffice.WriterGlobalDocument.1";
     Styles = ();
 End