diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2016-04-27 13:09:27 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-05-03 16:10:12 +0000 |
| commit | 29433c6496e8aa2d82ce56731d4bb734538a9f80 (patch) | |
| tree | 1743a426b796bd669f0d27d4e2e5dedbabf17719 /include/formula | |
| parent | -Werror,-Wpessimizing-move (diff) | |
| download | core-29433c6496e8aa2d82ce56731d4bb734538a9f80.tar.gz core-29433c6496e8aa2d82ce56731d4bb734538a9f80.zip | |
tdf#97831 [part] Add Excel 2016 functions to Calc
Functions IFS and SWITCH.
Change-Id: Ic43d42a933bcac883e9aa2213dd4ddeddf45abf0
Reviewed-on: https://gerrit.libreoffice.org/24424
Tested-by: Jenkins <ci@libreoffice.org>
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 | 4 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 034b165e2c68..0bb83608e28b 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -497,7 +497,9 @@ #define SC_OPCODE_FORECAST_LIN 486 #define SC_OPCODE_CONCAT_MS 487 #define SC_OPCODE_TEXTJOIN_MS 488 -#define SC_OPCODE_STOP_2_PAR 489 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_IFS_MS 489 +#define SC_OPCODE_SWITCH_MS 490 +#define SC_OPCODE_STOP_2_PAR 491 /* last function with two or more parameters' OpCode + 1 */ #define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR /* last function's OpCode + 1 */ #define SC_OPCODE_LAST_OPCODE_ID (SC_OPCODE_STOP_FUNCTION - 1) /* last OpCode */ diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 1bf955fef939..facaaabfa89b 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -282,6 +282,8 @@ enum OpCode : sal_uInt16 ocNominal = SC_OPCODE_NOMINAL, ocSubTotal = SC_OPCODE_SUB_TOTAL, ocRawSubtract = SC_OPCODE_RAWSUBTRACT, + ocIfs_MS = SC_OPCODE_IFS_MS, + ocSwitch_MS = SC_OPCODE_SWITCH_MS, // Database functions ocDBSum = SC_OPCODE_DB_SUM, ocDBCount = SC_OPCODE_DB_COUNT, |