diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-03-07 19:53:57 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2019-03-08 11:36:38 +0100 |
| commit | 13bc4a1c044091df08acf56695f2e00f2bd8fc2b (patch) | |
| tree | 82124433e2a6114ab50928f0462bee0584119d42 | |
| parent | 354a2209094a33195685efb00036543ece832c20 (diff) | |
Related tdf#111344: fix Bad token \text/x-ms-iqy
Noticed this on console:
cpp: <macro>:1 C:/BLP/core/scp2/source/calc/registryitem_calc.scp:1261 \
Bad token \text/x-ms-iqy produced by ##
See https://bugs.documentfoundation.org/show_bug.cgi?id=111344#c9
Change-Id: If6b5b4ae90c1b0fb812a5e2cd87d17fc688d21c6
Reviewed-on: https://gerrit.libreoffice.org/68885
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | scp2/inc/macros.inc | 10 | ||||
| -rw-r--r-- | scp2/source/calc/registryitem_calc.scp | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4e113f90a7f0..e801253df1f0 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -272,16 +272,6 @@ End 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(CONCAT2(.,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 a48a194522ed..ca0fc58921cd 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1258,7 +1258,16 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLS 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 ) + +RegistryItem gid_Regitem__MediaType_DefExt_Iqy + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Root_Reg_Iqy; + Subkey = "MIME\Database\Content Type\text/x-ms-iqy"; + Name = "Extension"; + Value = ".iqy"; + ComponentCondition = "REGISTER_IQY=1"; +End + 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 ) |