scp2/inc/macros.inc | 20 ++++++++++++++++++++ scp2/source/calc/registryitem_calc.scp | 2 ++ 2 files changed, 22 insertions(+)
New commits: commit b9c4c6025644bca6da3730a5d845e9a2ed9697f5 Author: Mike Kaganski <[email protected]> Date: Tue Apr 25 15:27:09 2017 +0300 tdf#106359: register text/x-ms-iqy MediaType default extension Change-Id: I63be77c4e148befa8f41086163ea2919b1e8baac Reviewed-on: https://gerrit.libreoffice.org/36942 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins <[email protected]> (cherry picked from commit 82fbc7147183dd27be81c20d7c362937bafc3546) Reviewed-on: https://gerrit.libreoffice.org/36958 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Mike Kaganski <[email protected]> diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index da09c7c2c3d0..935df547cce8 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -264,6 +264,26 @@ End ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ End +#define CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE(name,cond,key,mediatype) \ + RegistryItem gid_Regitem__MediaType_##name \ + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ + ModuleID = gid_Module_Root_Reg_##name; \ + Subkey = STRING(CONCAT2(.,key)); \ + Name = STRING(Content Type); \ + Value = STRING(mediatype); \ + ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ + End + +#define CONDITIONAL_REGISTRY_ENTRY_MEDIATYPE_DEF_EXT(name,cond,key,mediatype) \ + RegistryItem gid_Regitem__MediaType_DefExt_##name \ + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ + ModuleID = gid_Module_Root_Reg_##name; \ + Subkey = STRING(CONCAT2(MIME\Database\Content Type\,mediatype)); \ + Name = STRING(Extension); \ + Value = STRING(key); \ + ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ + End + #define REGISTRY_ENTRY_DOC(name,modid,disp_name) \ RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 2cb78210a2fa..214f5b84bd3b 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1250,6 +1250,8 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLS CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION( Iqy, gid_Module_Prg_Calc_MSO_Reg, iqy, IQY, MS_EXCEL_WEBQUERY, 0, scalc.exe, open, Calc ) +CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE( Iqy, IQY, iqy, text/x-ms-iqy ) +CONDITIONAL_REGISTRY_ENTRY_MEDIATYPE_DEF_EXT( Iqy, IQY, iqy, text/x-ms-iqy ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
