[Libreoffice-commits] .: scp2/inc scp2/source

Jesús Corrius jcorrius at kemper.freedesktop.org
Thu Feb 3 09:26:34 PST 2011


 scp2/inc/macros.inc                                        |   24 -
 scp2/source/base/registryitem_base.scp                     |   20 
 scp2/source/binfilter/registryitem_binfilter.scp           |  194 ++++-----
 scp2/source/calc/registryitem_calc.scp                     |  192 ++++-----
 scp2/source/draw/registryitem_draw.scp                     |  152 +++----
 scp2/source/impress/registryitem_impress.scp               |  164 +++----
 scp2/source/math/registryitem_math.scp                     |   98 ++--
 scp2/source/mkopenwith.btm                                 |    2 
 scp2/source/ooo/registryitem_ooo.scp                       |   30 -
 scp2/source/winexplorerext/registryitem_winexplorerext.scp |    4 
 scp2/source/writer/registryitem_writer.scp                 |  276 ++++++-------
 11 files changed, 578 insertions(+), 578 deletions(-)

New commits:
commit 555f2ad8cac961e049726ca8b11a4cd25fb461de
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Feb 3 18:25:04 2011 +0100

    Revert: Use different Windows registry keys than OOo

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
old mode 100755
new mode 100644
index 90c58c6..3fa2f8b
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -430,7 +430,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(LibreOffice.,name)); \
+        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
         Value = " "; \
     End
 
@@ -439,7 +439,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = gid_Module_Root_Reg_##name; \
         Subkey = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
@@ -447,7 +447,7 @@ End
     RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
+        Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
         REG_VALUE_LNG(disp_name) \
     End
 
@@ -455,7 +455,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
         Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
     End
 
@@ -463,7 +463,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
         Value = STRING(default); \
     End
 
@@ -471,13 +471,13 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
         REG_VALUE_LNG(NEW) \
     End \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
     End
 
@@ -485,7 +485,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
     End
 
@@ -493,7 +493,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
     End
 
@@ -501,7 +501,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
+        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
     End
 
@@ -511,7 +511,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(loffice.Star,doc_type,Document.6)); \
+        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
         Styles = (); \
     End
 
@@ -521,7 +521,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(loffice.Star,doc_type,Template.6)); \
+        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
         Styles = (); \
     End
 
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 7e80aaf..833ed39 100755
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -33,7 +33,7 @@ RegistryItem gid_Regitem_Odb
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odb";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Value = "libreoffice.DatabaseDocument.1";
+    Value = "opendocument.DatabaseDocument.1";
 End
 
 RegistryItem gid_Regitem_Odb_PersistentHandler
@@ -60,7 +60,7 @@ End
 RegistryItem gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
-    Subkey = "libreoffice.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -82,14 +82,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DatabaseDocument.1";
+    Subkey = "opendocument.DatabaseDocument.1";
     ModuleID = gid_Module_Prg_Base_Bin;
     REG_VALUE_LNG(OO_DATABASE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DatabaseDocument.1\DefaultIcon";
+    Subkey = "opendocument.DatabaseDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "<progpath>\program\soffice.exe,13";
 End
@@ -97,28 +97,28 @@ End
 RegistryItem gid_Regitem_odb_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "libreoffice.DatabaseDocument.1";
+    Subkey = "opendocument.DatabaseDocument.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
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DatabaseDocument.1\shell";
+    Subkey = "opendocument.DatabaseDocument.1\shell";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "open";
 End
 
 // RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
 //     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     Subkey = "libreoffice.DatabaseDocument.1\shell\open\command";
+//     Subkey = "opendocument.DatabaseDocument.1\shell\open\command";
 //     ModuleID = gid_Module_Prg_Base_Bin;
 //     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 // End
 
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DatabaseDocument.1\shell\open\command";
+    Subkey = "opendocument.DatabaseDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Base_Bin;
     Value = "\"<progpath>\program\sbase.exe\" -o \"%1\"";
     Styles = ();
@@ -130,7 +130,7 @@ RegistryItem gid_Regitem_OpenOffice_ODB_OpenWith_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odb\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Base_Bin;
-    Name = "libreoffice.DatabaseDocument.1";
+    Name = "opendocument.DatabaseDocument.1";
     Value = " ";
 End
 
@@ -139,7 +139,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Base_Bin;
     Name = ".odb";
-    Value = "libreoffice.DatabaseDocument.1";
+    Value = "opendocument.DatabaseDocument.1";
     Styles = ();
 End
 
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index c25f1b9..fa4e229 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -71,7 +71,7 @@ RegistryItem gid_Regitem__Sdw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = ".sdw";
-    Value = "loffice.StarWriterDocument.5";
+    Value = "soffice.StarWriterDocument.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdw
@@ -79,7 +79,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".sdw";
-    Value = "loffice.StarWriterDocument.5";
+    Value = "soffice.StarWriterDocument.5";
     Styles = ();
 End
 
@@ -88,7 +88,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".sgl";
-    Value = "loffice.StarWriterGlobalDocument.5";
+    Value = "soffice.StarWriterGlobalDocument.5";
     Styles = ();
 End
 
@@ -96,12 +96,12 @@ RegistryItem gid_Regitem__Sgl
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sgl";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "loffice.StarWriterGlobalDocument.5";
+    Value = "soffice.StarWriterGlobalDocument.5";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterDocument.5";
+    Subkey = "soffice.StarWriterDocument.5";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(SO52_TEXT_OOO)
 End
@@ -109,104 +109,104 @@ End
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\DefaultIcon";
+    Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,27";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\shell";
+    Subkey = "soffice.StarWriterDocument.5\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\shell\new";
+    Subkey = "soffice.StarWriterDocument.5\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\shell\new\command";
+    Subkey = "soffice.StarWriterDocument.5\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\shell\open\command";
+    Subkey = "soffice.StarWriterDocument.5\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\shell\print\command";
+    Subkey = "soffice.StarWriterDocument.5\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarWriterDocument.5\shell\printto\command";
+    Subkey = "soffice.StarWriterDocument.5\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5";
+    Subkey = "soffice.StarWriterGlobalDocument.5";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(SO51_MASTERDOC_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\DefaultIcon";
+    Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "<progpath>\program\soffice.exe,35";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\shell";
+    Subkey = "soffice.StarWriterGlobalDocument.5\shell";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\shell\new";
+    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\shell\new\command";
+    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\shell\open\command";
+    Subkey = "soffice.StarWriterGlobalDocument.5\shell\open\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\shell\print\command";
+    Subkey = "soffice.StarWriterGlobalDocument.5\shell\print\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarWriterGlobalDocument.5\shell\printto\command";
+    Subkey = "soffice.StarWriterGlobalDocument.5\shell\printto\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -240,56 +240,56 @@ End
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5";
+    Subkey = "soffice.StarCalcDocument.5";
     REG_VALUE_LNG(SO51_SPREADSHEET_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\DefaultIcon";
+    Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,29";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\shell";
+    Subkey = "soffice.StarCalcDocument.5\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\shell\new";
+    Subkey = "soffice.StarCalcDocument.5\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\shell\new\command";
+    Subkey = "soffice.StarCalcDocument.5\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\shell\open\command";
+    Subkey = "soffice.StarCalcDocument.5\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\shell\print\command";
+    Subkey = "soffice.StarCalcDocument.5\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarCalcDocument.5\shell\printto\command";
+    Subkey = "soffice.StarCalcDocument.5\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -297,7 +297,7 @@ RegistryItem gid_Regitem__Sdc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = ".sdc";
-    Value = "loffice.StarCalcDocument.5";
+    Value = "soffice.StarCalcDocument.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdc
@@ -305,7 +305,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".sdc";
-    Value = "loffice.StarCalcDocument.5";
+    Value = "soffice.StarCalcDocument.5";
     Styles = ();
 End
 
@@ -353,56 +353,56 @@ End
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5";
+    Subkey = "soffice.StarImpressDocument.5";
     REG_VALUE_LNG(SO51_PRESENT_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\DefaultIcon";
+    Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,33";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\shell";
+    Subkey = "soffice.StarImpressDocument.5\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\shell\new";
+    Subkey = "soffice.StarImpressDocument.5\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\shell\new\command";
+    Subkey = "soffice.StarImpressDocument.5\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\shell\open\command";
+    Subkey = "soffice.StarImpressDocument.5\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\shell\print\command";
+    Subkey = "soffice.StarImpressDocument.5\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarImpressDocument.5\shell\printto\command";
+    Subkey = "soffice.StarImpressDocument.5\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -410,7 +410,7 @@ RegistryItem gid_Regitem__Sdd
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = ".sdd";
-    Value = "loffice.StarImpressDocument.5";
+    Value = "soffice.StarImpressDocument.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdd
@@ -418,7 +418,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".sdd";
-    Value = "loffice.StarImpressDocument.5";
+    Value = "soffice.StarImpressDocument.5";
     Styles = ();
 End
 
@@ -426,7 +426,7 @@ RegistryItem gid_Regitem__Sdp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = ".sdp";
-    Value = "loffice.StarStorageDocument.5";
+    Value = "soffice.StarStorageDocument.5";
 End
 
 // .sdp no longer supported
@@ -435,7 +435,7 @@ End
 //     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
 //     ModuleID = gid_Module_Optional_Binfilter;
 //     Name = ".sdp";
-//     Value = "loffice.StarStorageDocument.5";
+//     Value = "soffice.StarStorageDocument.5";
 //     Styles = ();
 // End
 
@@ -468,56 +468,56 @@ End
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5";
+    Subkey = "soffice.StarDrawDocument.5";
     REG_VALUE_LNG(SO51_DRAWING_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\DefaultIcon";
+    Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,31";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\shell";
+    Subkey = "soffice.StarDrawDocument.5\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\shell\new";
+    Subkey = "soffice.StarDrawDocument.5\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\shell\new\command";
+    Subkey = "soffice.StarDrawDocument.5\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\shell\open\command";
+    Subkey = "soffice.StarDrawDocument.5\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\shell\print\command";
+    Subkey = "soffice.StarDrawDocument.5\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarDrawDocument.5\shell\printto\command";
+    Subkey = "soffice.StarDrawDocument.5\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -525,7 +525,7 @@ RegistryItem gid_Regitem__Sda
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = ".sda";
-    Value = "loffice.StarDrawDocument.5";
+    Value = "soffice.StarDrawDocument.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sda
@@ -533,7 +533,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".sda";
-    Value = "loffice.StarDrawDocument.5";
+    Value = "soffice.StarDrawDocument.5";
     Styles = ();
 End
 
@@ -564,119 +564,119 @@ End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5";
+    Subkey = "soffice.StarChartDocument.5";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(SO52_CHART_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\DefaultIcon";
+    Subkey = "soffice.StarChartDocument.5\DefaultIcon";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "<progpath>\program\soffice.exe,36";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\shell";
+    Subkey = "soffice.StarChartDocument.5\shell";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\shell\new";
+    Subkey = "soffice.StarChartDocument.5\shell\new";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\shell\new\command";
+    Subkey = "soffice.StarChartDocument.5\shell\new\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\shell\open\command";
+    Subkey = "soffice.StarChartDocument.5\shell\open\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\shell\print\command";
+    Subkey = "soffice.StarChartDocument.5\shell\print\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument.5\shell\printto\command";
+    Subkey = "soffice.StarChartDocument.5\shell\printto\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starchartdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarChartDocument\CurVer";
+    Subkey = "soffice.StarChartDocument\CurVer";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "loffice.StarChartDocument.5";
+    Value = "soffice.StarChartDocument.5";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5";
+    Subkey = "soffice.StarOfficeTemplate.5";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(SO50_TEMPLATE_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\DefaultIcon";
+    Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "<progpath>\program\soffice.exe,15";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\shell";
+    Subkey = "soffice.StarOfficeTemplate.5\shell";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\shell\new";
+    Subkey = "soffice.StarOfficeTemplate.5\shell\new";
     ModuleID = gid_Module_Optional_Binfilter;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\shell\new\command";
+    Subkey = "soffice.StarOfficeTemplate.5\shell\new\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\shell\open\command";
+    Subkey = "soffice.StarOfficeTemplate.5\shell\open\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\shell\print\command";
+    Subkey = "soffice.StarOfficeTemplate.5\shell\print\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarOfficeTemplate.5\shell\printto\command";
+    Subkey = "soffice.StarOfficeTemplate.5\shell\printto\command";
     ModuleID = gid_Module_Optional_Binfilter;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -685,7 +685,7 @@ RegistryItem gid_Regitem__Sds
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sds";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "loffice.StarChartDocument.5";
+    Value = "soffice.StarChartDocument.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sds
@@ -693,7 +693,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".sds";
-    Value = "loffice.StarChartDocument.5";
+    Value = "soffice.StarChartDocument.5";
     Styles = ();
 End
 
@@ -701,7 +701,7 @@ RegistryItem gid_Regitem__Vor
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor";
     ModuleID = gid_Module_Optional_Binfilter;
-    Value = "loffice.StarOfficeTemplate.5";
+    Value = "soffice.StarOfficeTemplate.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_vor
@@ -709,7 +709,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".vor";
-    Value = "loffice.StarOfficeTemplate.5";
+    Value = "soffice.StarOfficeTemplate.5";
     Styles = ();
 End
 
@@ -741,56 +741,56 @@ End
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5";
+    Subkey = "soffice.StarMathDocument.5";
     REG_VALUE_LNG(SO51_FORMULA_OOO)
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\DefaultIcon";
+    Subkey = "soffice.StarMathDocument.5\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,38";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\shell";
+    Subkey = "soffice.StarMathDocument.5\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\shell\new";
+    Subkey = "soffice.StarMathDocument.5\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\shell\new\command";
+    Subkey = "soffice.StarMathDocument.5\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\shell\open\command";
+    Subkey = "soffice.StarMathDocument.5\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\shell\print\command";
+    Subkey = "soffice.StarMathDocument.5\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "loffice.StarMathDocument.5\shell\printto\command";
+    Subkey = "soffice.StarMathDocument.5\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -798,7 +798,7 @@ RegistryItem gid_Regitem__Smf
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Binfilter;
     Subkey = ".smf";
-    Value = "loffice.StarMathDocument.5";
+    Value = "soffice.StarMathDocument.5";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_smf
@@ -806,7 +806,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Optional_Binfilter;
     Name = ".smf";
-    Value = "loffice.StarMathDocument.5";
+    Value = "soffice.StarMathDocument.5";
     Styles = ();
 End
 
@@ -816,7 +816,7 @@ RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdw\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarWriterDocument.5";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -825,7 +825,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarWriterDocument.5";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -834,7 +834,7 @@ RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sgl\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarWriterGlobalDocument.5";
+    Name = "soffice.StarWriterGlobalDocument.5";
     Value = " ";
 End
 
@@ -843,7 +843,7 @@ RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdc\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarCalcDocument.5";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -852,7 +852,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarCalcDocument.5";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -861,7 +861,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarImpressDocument.5";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -870,7 +870,7 @@ RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdp\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarImpressDocument.5";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -879,7 +879,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarImpressDocument.5";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -888,7 +888,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarImpressDocument.5";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -897,7 +897,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarDrawDocument.5";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -906,7 +906,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarDrawDocument.5";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -915,7 +915,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarDrawDocument.5";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -924,7 +924,7 @@ RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".smf\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "loffice.StarMathDocument.5";
+    Name = "soffice.StarMathDocument.5";
     Value = " ";
 End
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
old mode 100755
new mode 100644
index 7419bad..c76ae8b
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -111,7 +111,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\ProgID";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
 End
 
 RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Programmable
@@ -145,7 +145,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\VersionIndependentProgID";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
 End
 
 // MSOLE embedded object in OASIS file format
@@ -230,7 +230,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\ProgID";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Programmable
@@ -264,7 +264,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\VersionIndependentProgID";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
 End
 
 #endif // WITH_ACTIVEX_COMPONENT
@@ -272,7 +272,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6";
+    Subkey = "soffice.StarCalcDocument.6";
     REG_VALUE_LNG(SO60_SPREADSHEET)
 End
 
@@ -281,7 +281,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\CLSID";
+    Subkey = "soffice.StarCalcDocument.6\CLSID";
     Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
 End
 
@@ -290,145 +290,145 @@ End
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\DefaultIcon";
+    Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,29";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\Insertable";
+    Subkey = "soffice.StarCalcDocument.6\Insertable";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\protocol\StdFileEditing\server";
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\protocol\StdFileEditing\verb\0";
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-1";
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-2";
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shell";
+    Subkey = "soffice.StarCalcDocument.6\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shell\new";
+    Subkey = "soffice.StarCalcDocument.6\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shell\new\command";
+    Subkey = "soffice.StarCalcDocument.6\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shell\open\command";
+    Subkey = "soffice.StarCalcDocument.6\shell\open\command";
     Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shell\print\command";
+    Subkey = "soffice.StarCalcDocument.6\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shell\printto\command";
+    Subkey = "soffice.StarCalcDocument.6\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument\CurVer";
-    Value = "loffice.StarCalcDocument.6";
+    Subkey = "soffice.StarCalcDocument\CurVer";
+    Value = "soffice.StarCalcDocument.6";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6";
+    Subkey = "soffice.StarCalcTemplate.6";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(SO60_CALC_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\DefaultIcon";
+    Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "<progpath>\program\soffice.exe,30";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\shell";
+    Subkey = "soffice.StarCalcTemplate.6\shell";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\shell\new";
+    Subkey = "soffice.StarCalcTemplate.6\shell\new";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\shell\new\command";
+    Subkey = "soffice.StarCalcTemplate.6\shell\new\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\shell\open\command";
+    Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\shell\print\command";
+    Subkey = "soffice.StarCalcTemplate.6\shell\print\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarCalcTemplate.6\shell\printto\command";
+    Subkey = "soffice.StarCalcTemplate.6\shell\printto\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -457,7 +457,7 @@ End
 RegistryItem gid_Regitem_StarCalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "soffice.StarCalcDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -485,7 +485,7 @@ End
 RegistryItem gid_Regitem_StarCalcTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "loffice.StarCalcTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "soffice.StarCalcTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -493,7 +493,7 @@ RegistryItem gid_Regitem_Stc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stc";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "loffice.StarCalcTemplate.6";
+    Value = "soffice.StarCalcTemplate.6";
 End
 
 RegistryItem gid_Regitem_Stc_Contenttype
@@ -507,7 +507,7 @@ End
 RegistryItem gid_Regitem_stc_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "loffice.StarCalcTemplate.6";
+    Subkey = "soffice.StarCalcTemplate.6";
     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
@@ -533,7 +533,7 @@ RegistryItem gid_Regitem__Sxc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".sxc";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxc
@@ -541,14 +541,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".sxc";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_sxc_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "loffice.StarCalcDocument.6";
+    Subkey = "soffice.StarCalcDocument.6";
     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
@@ -580,7 +580,7 @@ End
 RegistryItem gid_Regitem_CalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -588,7 +588,7 @@ RegistryItem gid_Regitem__Ods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".ods";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
@@ -596,7 +596,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".ods";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
@@ -605,7 +605,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = "application/vnd.oasis.opendocument.spreadsheet";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
     Styles = ();
 End
 
@@ -628,7 +628,7 @@ End
 RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".ods\libreoffice.CalcDocument.1\ShellNew";
+    Subkey = ".ods\opendocument.CalcDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.ods";
 End
@@ -636,14 +636,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument\CurVer";
-    Value = "libreoffice.CalcDocument.1";
+    Subkey = "opendocument.CalcDocument\CurVer";
+    Value = "opendocument.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1";
+    Subkey = "opendocument.CalcDocument.1";
     REG_VALUE_LNG(OO_CALC)
 End
 
@@ -652,7 +652,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\CLSID";
+    Subkey = "opendocument.CalcDocument.1\CLSID";
     Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
 End
 
@@ -661,14 +661,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\DefaultIcon";
+    Subkey = "opendocument.CalcDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,3";
 End
 
 RegistryItem gid_Regitem_ods_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "libreoffice.CalcDocument.1";
+    Subkey = "opendocument.CalcDocument.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
@@ -676,62 +676,62 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\Insertable";
+    Subkey = "opendocument.CalcDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\protocol\StdFileEditing\server";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shell";
+    Subkey = "opendocument.CalcDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shell\new";
+    Subkey = "opendocument.CalcDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shell\new\command";
+    Subkey = "opendocument.CalcDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shell\open\command";
+    Subkey = "opendocument.CalcDocument.1\shell\open\command";
     Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -739,14 +739,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shell\print\command";
+    Subkey = "opendocument.CalcDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcDocument.1\shell\printto\command";
+    Subkey = "opendocument.CalcDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -777,7 +777,7 @@ RegistryItem gid_Regitem__Fods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".fods";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
@@ -785,7 +785,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fods";
-    Value = "libreoffice.CalcDocument.1";
+    Value = "opendocument.CalcDocument.1";
     Styles = (PATCH);
 End
 
@@ -823,7 +823,7 @@ End
 RegistryItem gid_Regitem_CalcTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "libreoffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -831,7 +831,7 @@ RegistryItem gid_Regitem_Ots
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "libreoffice.CalcTemplate.1";
+    Value = "opendocument.CalcTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ots_Contenttype
@@ -844,14 +844,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1";
+    Subkey = "opendocument.CalcTemplate.1";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(OO_CALC_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\DefaultIcon";
+    Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "<progpath>\program\soffice.exe,4";
 End
@@ -859,49 +859,49 @@ End
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "libreoffice.Calctemplate.1";
+    Subkey = "opendocument.Calctemplate.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
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\shell";
+    Subkey = "opendocument.CalcTemplate.1\shell";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\shell\new";
+    Subkey = "opendocument.CalcTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\shell\new\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\shell\open\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\shell\print\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.CalcTemplate.1\shell\printto\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -913,7 +913,7 @@ RegistryItem gid_Regitem_OpenOffice_ODS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ods\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "libreoffice.CalcDocument.1";
+    Name = "opendocument.CalcDocument.1";
     Value = " ";
 End
 
@@ -922,7 +922,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "libreoffice.CalcDocument.1";
+    Name = "opendocument.CalcDocument.1";
     Value = " ";
 End
 
@@ -931,7 +931,7 @@ RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -940,7 +940,7 @@ RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcTemplate.6";
+    Name = "soffice.StarCalcTemplate.6";
     Value = " ";
 End
 
@@ -949,7 +949,7 @@ RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dif\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -958,7 +958,7 @@ RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dbf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -967,7 +967,7 @@ RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xlw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -976,7 +976,7 @@ RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".rtf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -985,7 +985,7 @@ RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".slk\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -994,7 +994,7 @@ RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".csv\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1003,7 +1003,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1012,7 +1012,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1021,7 +1021,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1030,7 +1030,7 @@ RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wk1\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1039,7 +1039,7 @@ RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wks\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1048,7 +1048,7 @@ RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".123\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1057,7 +1057,7 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "loffice.StarCalcDocument.6";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1068,7 +1068,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".stc";
-    Value = "loffice.StarCalcTemplate.6";
+    Value = "soffice.StarCalcTemplate.6";
     Styles = ();
 End
 
@@ -1077,7 +1077,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dif";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1086,7 +1086,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dbf";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1095,7 +1095,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".slk";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1104,7 +1104,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".csv";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1113,7 +1113,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".xlw";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1122,7 +1122,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wk1";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1131,7 +1131,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wks";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1140,7 +1140,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".123";
-    Value = "loffice.StarCalcDocument.6";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
old mode 100755
new mode 100644
index 960bb38..5d7e0d9
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -111,7 +111,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\ProgID";
-    Value = "loffice.StarDrawDocument.6";
+    Value = "soffice.StarDrawDocument.6";
 End
 
 RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Programmable
@@ -145,7 +145,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\VersionIndependentProgID";
-    Value = "loffice.StarDrawDocument.6";
+    Value = "soffice.StarDrawDocument.6";
 End
 
 // MSOLE embedded object in OASIS file format
@@ -230,7 +230,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Progid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\ProgID";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Programmable
@@ -264,7 +264,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionind
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\VersionIndependentProgID";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
 End
 
 #endif // WITH_ACTIVEX_COMPONENT
@@ -272,7 +272,7 @@ End
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6";
+    Subkey = "soffice.StarDrawDocument.6";
     REG_VALUE_LNG(SO60_DRAWING)
 End
 
@@ -281,7 +281,7 @@ End
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\CLSID";
+    Subkey = "soffice.StarDrawDocument.6\CLSID";
     Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
 End
 
@@ -290,145 +290,145 @@ End
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\DefaultIcon";
+    Subkey = "soffice.StarDrawDocument.6\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,31";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shell";
+    Subkey = "soffice.StarDrawDocument.6\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shell\new";
+    Subkey = "soffice.StarDrawDocument.6\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shell\new\command";
+    Subkey = "soffice.StarDrawDocument.6\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shell\open\command";
+    Subkey = "soffice.StarDrawDocument.6\shell\open\command";
     Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shell\print\command";
+    Subkey = "soffice.StarDrawDocument.6\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shell\printto\command";
+    Subkey = "soffice.StarDrawDocument.6\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawDocument\CurVer";
+    Subkey = "soffice.StarDrawDocument\CurVer";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "loffice.StarDrawDocument.6";
+    Value = "soffice.StarDrawDocument.6";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\Insertable";
+    Subkey = "soffice.StarDrawDocument.6\Insertable";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\protocol\StdFileEditing\server";
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\protocol\StdFileEditing\verb\0";
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-1";
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-2";
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6";
+    Subkey = "soffice.StarDrawTemplate.6";
     ModuleID = gid_Module_Prg_Draw_Bin;
     REG_VALUE_LNG(SO60_DRAW_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\DefaultIcon";
+    Subkey = "soffice.StarDrawTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "<progpath>\program\soffice.exe,32";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\shell";
+    Subkey = "soffice.StarDrawTemplate.6\shell";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\shell\new";
+    Subkey = "soffice.StarDrawTemplate.6\shell\new";
     ModuleID = gid_Module_Prg_Draw_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\shell\new\command";
+    Subkey = "soffice.StarDrawTemplate.6\shell\new\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\shell\open\command";
+    Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\shell\print\command";
+    Subkey = "soffice.StarDrawTemplate.6\shell\print\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "loffice.StarDrawTemplate.6\shell\printto\command";
+    Subkey = "soffice.StarDrawTemplate.6\shell\printto\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -457,7 +457,7 @@ End
 RegistryItem gid_Regitem_StarDrawTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "soffice.StarDrawTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -465,7 +465,7 @@ RegistryItem gid_Regitem_Std
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "loffice.StarDrawTemplate.6";
+    Value = "soffice.StarDrawTemplate.6";
 End
 
 RegistryItem gid_Regitem_Std_Contenttype
@@ -479,7 +479,7 @@ End
 RegistryItem gid_Regitem_std_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "loffice.StarDrawTemplate.6";
+    Subkey = "soffice.StarDrawTemplate.6";
     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
@@ -508,7 +508,7 @@ End
 RegistryItem gid_Regitem_StarDrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "loffice.StarDrawDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "soffice.StarDrawDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -532,7 +532,7 @@ RegistryItem gid_Regitem__Sxd
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".sxd";
-    Value = "loffice.StarDrawDocument.6";
+    Value = "soffice.StarDrawDocument.6";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxd
@@ -540,14 +540,14 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".sxd";
-    Value = "loffice.StarDrawDocument.6";
+    Value = "soffice.StarDrawDocument.6";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_sxd_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "loffice.StarDrawDocument.6";
+    Subkey = "soffice.StarDrawDocument.6";
     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
@@ -578,7 +578,7 @@ End
 RegistryItem gid_Regitem_DrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -602,7 +602,7 @@ RegistryItem gid_Regitem__Odg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".odg";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
@@ -610,7 +610,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".odg";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = ();
 End
 
@@ -619,29 +619,29 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = "application/vnd.oasis.opendocument.graphics";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = ();
 End
 
 RegistryItem gid_Regitem_Odg_Openoffice_Drawdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = ".odg\libreoffice.DrawDocument.1\ShellNew";
+    Subkey = ".odg\opendocument.DrawDocument.1\ShellNew";
     Name = "FileName";
     Value = "soffice.odg";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawDocument\CurVer";
+    Subkey = "opendocument.DrawDocument\CurVer";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1";
+    Subkey = "opendocument.DrawDocument.1";
     REG_VALUE_LNG(OO_DRAW)
 End
 
@@ -650,7 +650,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\CLSID";
+    Subkey = "opendocument.DrawDocument.1\CLSID";
     Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
 End
 
@@ -659,14 +659,14 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\DefaultIcon";
+    Subkey = "opendocument.DrawDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,5";
 End
 
 RegistryItem gid_Regitem_odg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "libreoffice.DrawDocument.1";
+    Subkey = "opendocument.DrawDocument.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
@@ -674,28 +674,28 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shell";
+    Subkey = "opendocument.DrawDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shell\new";
+    Subkey = "opendocument.DrawDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shell\new\command";
+    Subkey = "opendocument.DrawDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shell\open\command";
+    Subkey = "opendocument.DrawDocument.1\shell\open\command";
     Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
     Styles = ();
 End
@@ -703,48 +703,48 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shell\print\command";
+    Subkey = "opendocument.DrawDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\shell\printto\command";
+    Subkey = "opendocument.DrawDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\Insertable";
+    Subkey = "opendocument.DrawDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\protocol\StdFileEditing\server";
+    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "opendocument.DrawDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
@@ -783,7 +783,7 @@ RegistryItem gid_Regitem__Fodg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = ".fodg";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
 End
 
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
@@ -791,7 +791,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Root;
     Name = ".fodg";
-    Value = "libreoffice.DrawDocument.1";
+    Value = "opendocument.DrawDocument.1";
     Styles = (PATCH);
 End
 
@@ -821,7 +821,7 @@ End
 RegistryItem gid_Regitem_DrawTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Subkey = "libreoffice.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -829,7 +829,7 @@ RegistryItem gid_Regitem_Otg
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "libreoffice.DrawTemplate.1";
+    Value = "opendocument.DrawTemplate.1";
 End
 
 RegistryItem gid_Regitem_Otg_Contenttype
@@ -842,14 +842,14 @@ End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1";
+    Subkey = "opendocument.DrawTemplate.1";
     ModuleID = gid_Module_Prg_Draw_Bin;
     REG_VALUE_LNG(OO_DRAW_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1\DefaultIcon";
+    Subkey = "opendocument.DrawTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "<progpath>\program\soffice.exe,6";
 End
@@ -857,49 +857,49 @@ End
 RegistryItem gid_Regitem_otg_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "libreoffice.DrawTemplate.1";
+    Subkey = "opendocument.DrawTemplate.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
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1\shell";
+    Subkey = "opendocument.DrawTemplate.1\shell";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1\shell\new";
+    Subkey = "opendocument.DrawTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Draw_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1\shell\new\command";
+    Subkey = "opendocument.DrawTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1\shell\open\command";
+    Subkey = "opendocument.DrawTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "libreoffice.DrawTemplate.1\shell\print\command";
+    Subkey = "opendocument.DrawTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Draw_Bin;

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list