From 0c547776340c3983a867890b34f4a931215f8f52 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 6 Apr 2017 10:02:33 +0300 Subject: tdf#106359: register .iqy in MSI and treat them as templates Change-Id: I7ae94c7717fbea03d96c539e05eeb565bafefd9f Reviewed-on: https://gerrit.libreoffice.org/36188 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- scp2/inc/macros.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'scp2/inc') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index a2e8daabe841..730b289779b2 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -368,7 +368,7 @@ End Styles = (); \ End -#define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ +#define CONDITIONAL_REGISTER_DOC_OPEN_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) \ @@ -376,11 +376,14 @@ End REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ 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_CAPABILITIES(name,modid,key,doc_type) \ + +#define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ + CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ + REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ - REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \ #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ CONDITIONAL_MODULE_ENTRY(name,modid) \ -- cgit