diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-04-17 21:58:26 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-04-25 09:39:31 +0000 |
| commit | 29c9712b042e410e93e92dead15f353f6ca1e263 (patch) | |
| tree | 73c8f7511450fcab912750d3c1b6054804a83519 /include/formula | |
| parent | 2e41702ed4f224f195d33054e2e714f546b4442c (diff) | |
fdo#73148 (partial patch) Add Excel 2010 function AGGREGATE
Change-Id: If8fc8608699a14e573456af2e1180342be942dd1
Reviewed-on: https://gerrit.libreoffice.org/8475
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 96ea885d4b8f..2ce723011e5b 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -467,8 +467,9 @@ #define SC_OPCODE_FLOOR_MS 467 #define SC_OPCODE_NETWORKDAYS_MS 468 #define SC_OPCODE_WORKDAY_MS 469 +#define SC_OPCODE_AGGREGATE 470 -#define SC_OPCODE_STOP_2_PAR 470 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_STOP_2_PAR 471 /* 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 f5afa19abca3..0e9fb708adf7 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -366,6 +366,7 @@ enum OpCodeEnum ocModalValue_Multi = SC_OPCODE_MODAL_VALUE_MULTI, ocZTest = SC_OPCODE_Z_TEST, ocZTest_MS = SC_OPCODE_Z_TEST_MS, + ocAggregate = SC_OPCODE_AGGREGATE, ocTTest = SC_OPCODE_T_TEST, ocTTest_MS = SC_OPCODE_T_TEST_MS, ocRank = SC_OPCODE_RANK, |