diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-01-08 17:15:22 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-01-30 12:30:56 +0000 |
| commit | 8185ecf65addcd0c10eda6863a849e39b93684d3 (patch) | |
| tree | 404ce7ccdfbd870d5187ccad5417ab101b39cfed /include | |
| parent | fdo#73869 fix highlight RTL Problem at the StartCenter window. (diff) | |
| download | core-8185ecf65addcd0c10eda6863a849e39b93684d3.tar.gz core-8185ecf65addcd0c10eda6863a849e39b93684d3.zip | |
fdo#73146 Add Excel 2010 functions
PERCENTILE.EXC, PERCENTILE.INC
PERCENTRANK.EXC, PERCENTRANK.INC
QUARTILE.EXC, QUARTILE.INC
RANK.EQ, RANK.AVG
Function ScInterpreter::ScRank() has been rewritten to give the function
the same way of computing as the related functions in this patch.
Change-Id: If3096b265bd47ca5f4afcab7ff746f7c8511df82
Reviewed-on: https://gerrit.libreoffice.org/7319
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 | 10 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index c4c20c27cff6..95abb545022e 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -448,8 +448,16 @@ #define SC_OPCODE_T_INV_2T 450 #define SC_OPCODE_T_INV_MS 451 #define SC_OPCODE_T_TEST_MS 452 +#define SC_OPCODE_PERCENTILE_INC 453 +#define SC_OPCODE_PERCENT_RANK_INC 454 +#define SC_OPCODE_QUARTILE_INC 455 +#define SC_OPCODE_RANK_EQ 456 +#define SC_OPCODE_PERCENTILE_EXC 457 +#define SC_OPCODE_PERCENT_RANK_EXC 458 +#define SC_OPCODE_QUARTILE_EXC 459 +#define SC_OPCODE_RANK_AVG 460 -#define SC_OPCODE_STOP_2_PAR 453 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_STOP_2_PAR 461 /* 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 bc7fe0fa6d84..168fa75270a2 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -364,6 +364,14 @@ enum OpCodeEnum ocRank = SC_OPCODE_RANK, ocPercentile = SC_OPCODE_PERCENTILE, ocPercentrank = SC_OPCODE_PERCENT_RANK, + ocPercentile_Inc = SC_OPCODE_PERCENTILE_INC, + ocPercentrank_Inc = SC_OPCODE_PERCENT_RANK_INC, + ocQuartile_Inc = SC_OPCODE_QUARTILE_INC, + ocRank_Eq = SC_OPCODE_RANK_EQ, + ocPercentile_Exc = SC_OPCODE_PERCENTILE_EXC, + ocPercentrank_Exc = SC_OPCODE_PERCENT_RANK_EXC, + ocQuartile_Exc = SC_OPCODE_QUARTILE_EXC, + ocRank_Avg = SC_OPCODE_RANK_AVG, ocLarge = SC_OPCODE_LARGE, ocSmall = SC_OPCODE_SMALL, ocFrequency = SC_OPCODE_FREQUENCY, |