diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-05-15 10:42:30 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-05-15 11:07:30 +0200 |
| commit | ccd7f45d1fb9bc96e17657bed7a76c79f4ad5801 (patch) | |
| tree | 70822dfe1f47820c5ebad3f1f721cf3567b72e8b /scp2 | |
| parent | 74d2e606fd3605fe0a585f596eaa215ae4e20d18 (diff) | |
tdf#100837: advertise app URL capabilities
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>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/inc/macros.inc | 10 | ||||
| -rw-r--r-- | scp2/source/calc/registryitem_calc.scp | 1 | ||||
| -rw-r--r-- | scp2/source/draw/registryitem_draw.scp | 1 | ||||
| -rw-r--r-- | scp2/source/impress/registryitem_impress.scp | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/registryitem_ooo.scp | 1 | ||||
| -rw-r--r-- | scp2/source/writer/registryitem_writer.scp | 1 |
6 files changed, 15 insertions, 0 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ce6a5caaf1e8..8825fdc55d79 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -388,6 +388,16 @@ End Styles = (); \ 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) \ CONDITIONAL_MODULE_ENTRY(name,modid) \ REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 214f5b84bd3b..e660c41c5983 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1263,3 +1263,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, WB2 // registering ms-excel URI scheme handler 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) diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 94e35437e450..c33b9026433e 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -1104,3 +1104,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( PCD, gid_Module_Prg_Draw_Other_Reg, pcd, P // registering ms-visio URI scheme handler 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) diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 76370ffbe216..fdaef6c39528 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -1126,3 +1126,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Cgm, gid_Module_Prg_Impress_Other_Reg, cgm, // registering ms-powerpoint URI scheme handler 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) diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index f6c0e49562eb..ed93d2816100 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -679,3 +679,4 @@ End // registering vnd.libreoffice.command URI scheme handler 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) diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 61498b4f7b0b..71a06fc0a586 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -1748,3 +1748,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( 602, gid_Module_Prg_Wrt_Other_Reg, 602, 60 // registering ms-word URI scheme handler 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) |