INTEGRATION: CWS native188_DEV300 (1.20.54); FILE MERGED

2008/08/21 12:31:34 dv 1.20.54.1: #i92988# Always write all entries needed for registering in open with list

1 files changed, 22 insertions, 30 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 5e7de46a9c39..56040ce12d0b 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -419,87 +419,79 @@ End
         ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_DOC(name,cond,disp_name) \
+#define REGISTRY_ENTRY_DOC(name,modid,disp_name) \
     RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
         REG_VALUE_LNG(disp_name) \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_ICON(name,cond,icon_id) \
+#define REGISTRY_ENTRY_ICON(name,modid,icon_id) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
         Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_SHELL(name,default,cond) \
+#define REGISTRY_ENTRY_SHELL(name,default,modid) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
         Value = STRING(default); \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_NEW_CMD(name,cond,app) \
+#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
         REG_VALUE_LNG(NEW) \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_OPEN_CMD(name,cond,app) \
+#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_PRINT_CMD(name,cond,app) \
+#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
-#define CONDITIONAL_REGISTRY_ENTRY_PRINTTO_CMD(name,cond,app) \
+#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
     RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
-        ModuleID = gid_Module_Root_Reg_##name; \
+        ModuleID = modid; \
         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); \
         Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
-        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
     End
 
 #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
     REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
     CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
-    CONDITIONAL_REGISTRY_ENTRY_DOC(name,cond,disp_name) \
-    CONDITIONAL_REGISTRY_ENTRY_ICON(name,cond,icon_id) \
-    CONDITIONAL_REGISTRY_ENTRY_SHELL(name,default,cond) \
-    CONDITIONAL_REGISTRY_ENTRY_NEW_CMD(name,cond,app) \
-    CONDITIONAL_REGISTRY_ENTRY_OPEN_CMD(name,cond,app) \
-    CONDITIONAL_REGISTRY_ENTRY_PRINT_CMD(name,cond,app) \
-    CONDITIONAL_REGISTRY_ENTRY_PRINTTO_CMD(name,cond,app) \
+    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
+    REGISTRY_ENTRY_SHELL(name,default,modid) \
+    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
 
 // ---------------------------------------