use LibreOffice instead of OpenOffice.org in registry

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

1 files changed, 13 insertions, 13 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