use LibreOffice instead of OpenOffice.org in registry

it may help to solve file association issues, especially when
OpenOffice.org is/was also installed

2 files changed, 17 insertions, 21 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c54049548165..0ceb5119afa5 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -356,7 +356,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Name = STRING(CONCAT2(LibreOffice.,name)); \
         Value = " "; \
     End
 
@@ -365,7 +365,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
         Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Name = STRING(CONCAT2(LibreOffice.,name)); \
         Value = " "; \
     End
 
@@ -374,7 +374,7 @@ End
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = gid_Module_Root_Reg_##name; \
         Subkey = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(LibreOffice.,name)); \
         ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
@@ -382,7 +382,7 @@ End
     RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
         REG_VALUE_LNG(disp_name) \
     End
 
@@ -390,7 +390,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \
         Value = "<progpath>\program\soffice.bin," STRING(icon_id); \
     End
 
@@ -398,7 +398,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \
         Value = STRING(default); \
     End
 
@@ -406,13 +406,13 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,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(OpenOffice.org.,name,\shell\new\command)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
     End
 
@@ -420,7 +420,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
     End
 
@@ -428,7 +428,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
     End
 
@@ -436,7 +436,7 @@ End
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
         ModuleID = modid; \
-        Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
     End
 
@@ -446,7 +446,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(LibreOffice.,name)); \
         Styles = (); \
     End
 
@@ -456,7 +456,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = STRING(CONCAT2(LibreOffice.,name)); \
         Styles = (); \
     End
 
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 78de7890f810..c7def3ef142f 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -81,8 +81,8 @@ RegistryItem gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F
     ModuleID = gid_Module_Optional_Winexplorerext;
     Styles = (X64);
     Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
-    Value = "OpenOffice.org Column Handler";
-    Val64 = "OpenOffice.org Column Handler";
+    Value = "%PRODUCTNAME Column Handler";
+    Val64 = "%PRODUCTNAME Column Handler";
 End
 
 RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
@@ -112,9 +112,7 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
-// Better?: "OpenOffice.org Format Filter"
-// old:    Value = "opendocument.org Filter";
-	Styles = (X64_ONLY); // Values: X64
+    Styles = (X64_ONLY); // Values: X64
     Value = "OpenDocument Format Filter";
     Val64 = "OpenDocument Format Filter";
 End
@@ -142,9 +140,7 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
-//? Better: "OpenOffice.org Persistent Handler"
-// old:    Value = "opendocument.org Persistent Handler";
-	Styles = (X64); // Values: X64
+    Styles = (X64); // Values: X64
     Value = "OpenDocument Format Persistent Handler";
     Val64 = "OpenDocument Format Persistent Handler";
 End