diff options
Diffstat (limited to 'scp2/inc/macros.inc')
| -rwxr-xr-x[-rw-r--r--] | scp2/inc/macros.inc | 86 |
1 files changed, 16 insertions, 70 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8bf6350d7465..f6101b677464 100644..100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -300,24 +300,6 @@ Styles = (PACKED,DONT_OVERWRITE,PATCH); \ End -#define UNO_JAR_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE, UNO_COMPONENT); \ - End - -#define UNO_JAR_FILE_PATCH(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = STRING(CONCAT2(name,.jar)); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - Dir = gid_Dir_Classes; \ - Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT,PATCH); \ - End - #define JARFILENAME(name) STRING(CONCAT2(name,.jar)) #define PACKED_SHELLNEW_FILE_BODY \ @@ -332,52 +314,16 @@ Name = STRING(name) ; \ End -#define PACKED_UNO_LIB_FILE_BODY \ - TXT_FILE_BODY; \ - Styles = (PACKED,UNO_COMPONENT); \ - Dir = SCP2_OOO_BIN_DIR; \ - RegistryID = gid_Starregistry_Services_Rdb - -#define PACKED_UNO_LIB_FILE_BODY_PATCH \ - TXT_FILE_BODY; \ - Styles = (PACKED,UNO_COMPONENT,PATCH); \ - Dir = SCP2_OOO_BIN_DIR; \ - RegistryID = gid_Starregistry_Services_Rdb - -#define STD_UNO_LIB_FILE(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ - End - -#define STD_UNO_LIB_FILE_PATCH(id,name) \ - File id \ - Name = LIBNAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_UNO_LIB_FILE(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ - End - -#define SPECIAL_UNO_LIB_FILE_PATCH(id,name) \ - File id \ - Name = SPECIAL_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ - End - -#define SPECIAL_UNO_COMPONENT_LIB_FILE(id,name) \ +#define SPECIAL_COMPONENT_LIB_FILE(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY; \ + PACKED_LIB_FILE_BODY; \ End -#define SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(id,name) \ +#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \ File id \ Name = SPECIAL_COMPONENT_LIB_NAME(name); \ - PACKED_UNO_LIB_FILE_BODY_PATCH; \ + PACKED_LIB_FILE_BODY_PATCH; \ End #define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll)) @@ -406,15 +352,6 @@ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \ End -#define SPECIAL_UNO_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \ - File id \ - TXT_FILE_BODY; \ - Name = LIBNAME(name); \ - Dir = SCP2_OOO_BIN_DIR; \ - Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \ - RegistryID = gid_Starregistry_Services_Rdb; \ - End - // --------------------------------------- #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ @@ -434,6 +371,15 @@ End Value = " "; \ End +#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \ + RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \ + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ + ModuleID = modid; \ + Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \ + Name = STRING(CONCAT2(OpenOffice.org.,name)); \ + Value = " "; \ + End + #define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ RegistryItem gid_Regitem__##name \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ @@ -511,7 +457,7 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \ + Value = STRING(CONCAT2(OpenOffice.org.,name)); \ Styles = (); \ End @@ -521,7 +467,7 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \ + Value = STRING(CONCAT2(OpenOffice.org.,name)); \ Styles = (); \ End @@ -540,7 +486,7 @@ End #define CONDITIONAL_REGISTER_DOCTEMPLATE_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) \ + REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \ CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ REGISTRY_ENTRY_DOC(name,modid,disp_name) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ |