diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-11-24 13:52:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-14 15:17:08 +0000 |
| commit | 7eec8e5c7146a231e9d67bd96eaff30018488c39 (patch) | |
| tree | 9be86554e294af9f747680ebf3d8f8b442d624a1 /include/formula | |
| parent | a3e51e2706f37f4a7a3a3276d96fd4bcad7f5f7c (diff) | |
add ODF1.2 function ERROR.TYPE to Calc
Also, improve exchange between Calc and Excel2013.
Change-Id: I491f9e2100a9a2c38e23cf55dd1eda4b5e96db96
Reviewed-on: https://gerrit.libreoffice.org/13101
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/compiler.hrc | 3 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 5686a8b21cbf..1d6b901f15ab 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -194,7 +194,8 @@ #define SC_OPCODE_GAMMA_LN_MS 162 #define SC_OPCODE_ERF_MS 163 #define SC_OPCODE_ERFC_MS 164 -#define SC_OPCODE_STOP_1_PAR 165 +#define SC_OPCODE_ERROR_TYPE_ODF 165 +#define SC_OPCODE_STOP_1_PAR 166 /*** Functions with more than one parameters ***/ #define SC_OPCODE_START_2_PAR 201 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index c9e105d4787b..33cf54ce5427 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -178,6 +178,7 @@ enum OpCode : sal_uInt16 ocGammaLn_MS = SC_OPCODE_GAMMA_LN_MS, ocGamma = SC_OPCODE_GAMMA, ocErrorType = SC_OPCODE_ERROR_TYPE, + ocErrorType_ODF = SC_OPCODE_ERROR_TYPE_ODF, ocFormula = SC_OPCODE_FORMULA, ocArabic = SC_OPCODE_ARABIC, ocInfo = SC_OPCODE_INFO, |