diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2013-11-21 11:16:43 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-11-22 05:37:39 -0600 |
| commit | e434c1ce0557454ef4cdd98435c5c0b1d5181bcf (patch) | |
| tree | 1cb354c51501971e3f4251297f26bc9fcae1d0c7 /include/formula | |
| parent | 5238d79a7c3067b182cbce51e2118a6fa336899a (diff) | |
fdo#71722 add Excel 2010 functions
EXPON.DIST, HYPGEOM.DIST, POISSON.DIST, WEIBULL.DIST
Change-Id: Ib9f648739ec0af90cdf2f576c7f548a6acb7b4a6
Reviewed-on: https://gerrit.libreoffice.org/6748
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 | 6 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 4f2f4e6d67c8..9bda945bae51 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -430,8 +430,12 @@ #define SC_OPCODE_F_INV_LT 432 #define SC_OPCODE_F_INV_RT 433 #define SC_OPCODE_F_TEST_MS 434 +#define SC_OPCODE_EXP_DIST_MS 435 +#define SC_OPCODE_HYP_GEOM_DIST_MS 436 +#define SC_OPCODE_POISSON_DIST_MS 437 +#define SC_OPCODE_WEIBULL_MS 438 -#define SC_OPCODE_STOP_2_PAR 435 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_STOP_2_PAR 439 /* 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 b5953f769765..58f3d4188ba5 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -229,10 +229,12 @@ enum OpCodeEnum ocB = SC_OPCODE_B, ocNormDist = SC_OPCODE_NORM_DIST, ocExpDist = SC_OPCODE_EXP_DIST, + ocExpDist_MS = SC_OPCODE_EXP_DIST_MS, ocBinomDist = SC_OPCODE_BINOM_DIST, ocBinomDist_MS = SC_OPCODE_BINOM_DIST_MS, ocBinomInv = SC_OPCODE_BINOM_INV, ocPoissonDist = SC_OPCODE_POISSON_DIST, + ocPoissonDist_MS = SC_OPCODE_POISSON_DIST_MS, ocKombin = SC_OPCODE_KOMBIN, ocKombin2 = SC_OPCODE_KOMBIN_2, ocVariationen = SC_OPCODE_VARIATIONEN, @@ -323,6 +325,7 @@ enum OpCodeEnum ocBackSolver = SC_OPCODE_BACK_SOLVER, // Statistical functions ocHypGeomDist = SC_OPCODE_HYP_GEOM_DIST, + ocHypGeomDist_MS = SC_OPCODE_HYP_GEOM_DIST_MS, ocLogNormDist = SC_OPCODE_LOG_NORM_DIST, ocTDist = SC_OPCODE_T_DIST, ocFDist = SC_OPCODE_F_DIST, @@ -335,6 +338,7 @@ enum OpCodeEnum ocChiSqInv = SC_OPCODE_CHISQ_INV, ocChiSqInv_MS = SC_OPCODE_CHISQ_INV_MS, ocWeibull = SC_OPCODE_WEIBULL, + ocWeibull_MS = SC_OPCODE_WEIBULL_MS, ocNegBinomVert = SC_OPCODE_NEG_BINOM_VERT, ocKritBinom = SC_OPCODE_KRIT_BINOM, ocKurt = SC_OPCODE_KURT, |