diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2016-05-03 21:19:19 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-05-04 21:54:01 +0000 |
| commit | c57dc741a6f221f53f3c8da2f521c6ece63246c2 (patch) | |
| tree | ded3a12b1dbb08fe920045fadf09a2e877e6145d /include | |
| parent | loplugin:staticmethods (diff) | |
| download | core-c57dc741a6f221f53f3c8da2f521c6ece63246c2.tar.gz core-c57dc741a6f221f53f3c8da2f521c6ece63246c2.zip | |
tdf#97831 [part] Add Excel 2016 functions to Calc
Functions MINIFS and MAXIFS
Change-Id: I4bd2e8b82f8377af81f4373d0c33ac286588b8df
Reviewed-on: https://gerrit.libreoffice.org/24619
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -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 0bb83608e28b..7a7bfe74ab94 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -499,7 +499,9 @@ #define SC_OPCODE_TEXTJOIN_MS 488 #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_MINIFS_MS 491 +#define SC_OPCODE_MAXIFS_MS 492 +#define SC_OPCODE_STOP_2_PAR 493 /* 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 facaaabfa89b..30dc94ff578c 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -284,6 +284,8 @@ enum OpCode : sal_uInt16 ocRawSubtract = SC_OPCODE_RAWSUBTRACT, ocIfs_MS = SC_OPCODE_IFS_MS, ocSwitch_MS = SC_OPCODE_SWITCH_MS, + ocMinIfs_MS = SC_OPCODE_MINIFS_MS, + ocMaxIfs_MS = SC_OPCODE_MAXIFS_MS, // Database functions ocDBSum = SC_OPCODE_DB_SUM, ocDBCount = SC_OPCODE_DB_COUNT, |