mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#100837: advertise app URL capabilities

Browse Source 
This is required to be able to use handlers when invoked from
Office Web Apps (on Win7+)

Change-Id: I242111ad365f5cb350b78b75300ddbe8b708b357
Reviewed-on: https://gerrit.libreoffice.org/37624
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2017-05-15 10:42:30 +03:00
parent 74d2e606fd
commit ccd7f45d1f
6 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scp2/inc/macros.inc
View File

@ -388,6 +388,16 @@ End
Styles = (); \ Styles = (); \
End End
#define REGISTRY_ENTRY_CAPABILITIES_URL(scheme,name,modid,handler) \
RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_URLAssociations_,name) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\URLAssociations); \
Name = scheme; \
Value = handler; \
Styles = (); \
End
#define CONDITIONAL_REGISTER_DOC_OPEN_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) \ CONDITIONAL_MODULE_ENTRY(name,modid) \
REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \

1
scp2/source/calc/registryitem_calc.scp
View File

@ -1263,3 +1263,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, WB2
// registering ms-excel URI scheme handler // registering ms-excel URI scheme handler
CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL ) CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL )
REGISTRY_ENTRY_CAPABILITIES_URL(ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, vnd.libreoffice.command)

1
scp2/source/draw/registryitem_draw.scp
View File

@ -1104,3 +1104,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( PCD, gid_Module_Prg_Draw_Other_Reg, pcd, P
// registering ms-visio URI scheme handler // registering ms-visio URI scheme handler
CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO ) CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO )
REGISTRY_ENTRY_CAPABILITIES_URL(ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, vnd.libreoffice.command)

1
scp2/source/impress/registryitem_impress.scp
View File

@ -1126,3 +1126,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Cgm, gid_Module_Prg_Impress_Other_Reg, cgm,
// registering ms-powerpoint URI scheme handler // registering ms-powerpoint URI scheme handler
CONDITIONAL_REGISTER_URI_HANDLER( ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, SELECT_POWERPOINT ) CONDITIONAL_REGISTER_URI_HANDLER( ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, SELECT_POWERPOINT )
REGISTRY_ENTRY_CAPABILITIES_URL(ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, vnd.libreoffice.command)

1
scp2/source/ooo/registryitem_ooo.scp
View File

@ -679,3 +679,4 @@ End
// registering vnd.libreoffice.command URI scheme handler // registering vnd.libreoffice.command URI scheme handler
REGISTER_URI_HANDLER( vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root ) REGISTER_URI_HANDLER( vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root )
REGISTRY_ENTRY_CAPABILITIES_URL(vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root, vnd.libreoffice.command)

1
scp2/source/writer/registryitem_writer.scp
View File

@ -1748,3 +1748,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( 602, gid_Module_Prg_Wrt_Other_Reg, 602, 60
// registering ms-word URI scheme handler // registering ms-word URI scheme handler
CONDITIONAL_REGISTER_URI_HANDLER( ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, SELECT_WORD ) CONDITIONAL_REGISTER_URI_HANDLER( ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, SELECT_WORD )
REGISTRY_ENTRY_CAPABILITIES_URL(ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, vnd.libreoffice.command)