diff options
| author | Winfried Donkers <osc@dci-electronics.nl> | 2013-01-07 15:34:32 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-01-11 17:01:23 +0100 |
| commit | 5fd9feafa5d73121636af9397d42e046cc394719 (patch) | |
| tree | 8e21bfd21fe23e64a9eb3214c9c7ade60ce312a8 /formula/inc | |
| parent | 0f4afa41ec8e2f438fbea9e4d7a123f668b124ca (diff) | |
fdo#56124 add functions IFERROR and IFNA to calc as in ODFF1.2
Change-Id: I6403b51ac8c710ad3b8d2625e1482971f50e6b1d
Diffstat (limited to 'formula/inc')
| -rw-r--r-- | formula/inc/formula/compiler.hrc | 42 | ||||
| -rw-r--r-- | formula/inc/formula/opcode.hxx | 2 |
2 files changed, 24 insertions, 20 deletions
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index 582e3a589c93..7f976ae3a163 100644 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -29,26 +29,28 @@ #define SC_OPCODE_NAME 4 #define SC_OPCODE_EXTERNAL_REF 5 #define SC_OPCODE_IF 6 /* jump commands */ -#define SC_OPCODE_CHOSE 7 -#define SC_OPCODE_OPEN 8 /* parentheses and separators */ -#define SC_OPCODE_CLOSE 9 -#define SC_OPCODE_SEP 10 -#define SC_OPCODE_MISSING 11 /* special OpCodes */ -#define SC_OPCODE_BAD 12 -#define SC_OPCODE_STRINGXML 13 -#define SC_OPCODE_SPACES 14 -#define SC_OPCODE_MAT_REF 15 -#define SC_OPCODE_DB_AREA 16 /* additional access operators */ -#define SC_OPCODE_MACRO 17 -#define SC_OPCODE_COL_ROW_NAME 18 -#define SC_OPCODE_COL_ROW_NAME_AUTO 19 -#define SC_OPCODE_PERCENT_SIGN 20 /* operator _follows_ value */ -#define SC_OPCODE_ARRAY_OPEN 21 -#define SC_OPCODE_ARRAY_CLOSE 22 -#define SC_OPCODE_ARRAY_ROW_SEP 23 -#define SC_OPCODE_ARRAY_COL_SEP 24 /* some convs use sep != col_sep */ -#define SC_OPCODE_STOP_DIV 25 -#define SC_OPCODE_SKIP 26 /* used to skip raw tokens during string compilation */ +#define SC_OPCODE_IF_ERROR 7 +#define SC_OPCODE_IF_NA 8 +#define SC_OPCODE_CHOSE 9 +#define SC_OPCODE_OPEN 10 /* parentheses and separators */ +#define SC_OPCODE_CLOSE 11 +#define SC_OPCODE_SEP 12 +#define SC_OPCODE_MISSING 13 /* special OpCodes */ +#define SC_OPCODE_BAD 14 +#define SC_OPCODE_STRINGXML 15 +#define SC_OPCODE_SPACES 16 +#define SC_OPCODE_MAT_REF 17 +#define SC_OPCODE_DB_AREA 18 /* additional access operators */ +#define SC_OPCODE_MACRO 19 +#define SC_OPCODE_COL_ROW_NAME 20 +#define SC_OPCODE_COL_ROW_NAME_AUTO 21 +#define SC_OPCODE_PERCENT_SIGN 22 /* operator _follows_ value */ +#define SC_OPCODE_ARRAY_OPEN 23 +#define SC_OPCODE_ARRAY_CLOSE 24 +#define SC_OPCODE_ARRAY_ROW_SEP 25 +#define SC_OPCODE_ARRAY_COL_SEP 26 /* some convs use sep != col_sep */ +#define SC_OPCODE_STOP_DIV 27 +#define SC_OPCODE_SKIP 28 /* used to skip raw tokens during string compilation */ /*** error constants #... ***/ #define SC_OPCODE_START_ERRORS 30 diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index cd1831b89637..e37395ea6e70 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -34,6 +34,8 @@ enum OpCodeEnum ocExternalRef = SC_OPCODE_EXTERNAL_REF, // Jump commands ocIf = SC_OPCODE_IF, + ocIfError = SC_OPCODE_IF_ERROR, + ocIfNA = SC_OPCODE_IF_NA, ocChose = SC_OPCODE_CHOSE, // Parentheses and separators ocOpen = SC_OPCODE_OPEN, |