diff options
author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-02-02 12:37:39 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2014-03-05 05:53:24 -0600 |
commit | e4def6edaa4686e50bbfd4490a4b9ddb928397a4 (patch) | |
tree | 37ca27719617cabc366356d2e4336a2453e09bcb /formula | |
parent | c1d9f1ff1868ecd8fa21028c53c5dd357701affe (diff) |
fdo#72197 Add Excel 2010 functions
MODE.SNGL, MODE.MULT, NEGBINOM.DIST, Z.TEST
Change-Id: I55eb05e1ebdb9dbc3ce9ae84e3cdacfdfa112091
Reviewed-on: https://gerrit.libreoffice.org/7776
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 1 | ||||
-rw-r--r-- | formula/source/core/resource/core_resource.src | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 03028558e8e4..d37f8cf15ebc 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -842,6 +842,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode ) case ocMatMult : case ocMatInv : case ocMatrixUnit : + case ocModalValue_Multi : return true; default: { diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index d3b3ea351300..a6de2713bc08 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -301,6 +301,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; }; String SC_OPCODE_WEIBULL_MS { Text = "COM.MICROSOFT.WEIBULL.DIST" ; }; String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; }; + String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "COM.MICROSOFT.NEGBINOM.DIST" ; }; String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; }; String SC_OPCODE_BINOM_INV { Text = "COM.MICROSOFT.BINOM.INV" ; }; String SC_OPCODE_KURT { Text = "KURT" ; }; @@ -313,7 +314,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; }; String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; }; String SC_OPCODE_MODAL_VALUE { Text = "MODE" ; }; + String SC_OPCODE_MODAL_VALUE_MS { Text = "COM.MICROSOFT.MODE.SNGL" ; }; + String SC_OPCODE_MODAL_VALUE_MULTI { Text = "COM.MICROSOFT.MODE.MULT" ; }; String SC_OPCODE_Z_TEST { Text = "ZTEST" ; }; + String SC_OPCODE_Z_TEST_MS { Text = "COM.MICROSOFT.Z.TEST" ; }; String SC_OPCODE_T_TEST { Text = "TTEST" ; }; String SC_OPCODE_T_TEST_MS { Text = "COM.MICROSOFT.T.TEST" ; }; String SC_OPCODE_RANK { Text = "RANK" ; }; @@ -695,6 +699,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; }; String SC_OPCODE_WEIBULL_MS { Text = "_xlfn.WEIBULL.DIST" ; }; String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; }; + String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "_xlfn.NEGBINOM.DIST" ; }; String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; }; String SC_OPCODE_BINOM_INV { Text = "_xlfn.BINOM.INV" ; }; String SC_OPCODE_KURT { Text = "KURT" ; }; @@ -707,7 +712,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; }; String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; }; String SC_OPCODE_MODAL_VALUE { Text = "MODE" ; }; + String SC_OPCODE_MODAL_VALUE_MS { Text = "_xlfn.MODE.SNGL" ; }; + String SC_OPCODE_MODAL_VALUE_MULTI { Text = "_xlfn.MODE.MULT" ; }; String SC_OPCODE_Z_TEST { Text = "ZTEST" ; }; + String SC_OPCODE_Z_TEST_MS { Text = "_xlfn.Z.TEST" ; }; String SC_OPCODE_T_TEST { Text = "TTEST" ; }; String SC_OPCODE_T_TEST_MS { Text = "_xlfn.T.TEST" ; }; String SC_OPCODE_RANK { Text = "RANK" ; }; @@ -1091,6 +1099,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_WEIBULL { Text = "WEIBULL" ; }; String SC_OPCODE_WEIBULL_MS { Text = "WEIBULL.DIST" ; }; String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; }; + String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "NEGBINOM.DIST" ; }; String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; }; String SC_OPCODE_BINOM_INV { Text = "BINOM.INV" ; }; String SC_OPCODE_KURT { Text = "KURT" ; }; @@ -1103,7 +1112,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; }; String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; }; String SC_OPCODE_MODAL_VALUE { Text = "MODE" ; }; + String SC_OPCODE_MODAL_VALUE_MS { Text = "MODE.SNGL" ; }; + String SC_OPCODE_MODAL_VALUE_MULTI { Text = "MODE.MULT" ; }; String SC_OPCODE_Z_TEST { Text = "ZTEST" ; }; + String SC_OPCODE_Z_TEST_MS { Text = "Z.TEST" ; }; String SC_OPCODE_T_TEST { Text = "TTEST" ; }; String SC_OPCODE_T_TEST_MS { Text = "T.TEST" ; }; String SC_OPCODE_RANK { Text = "RANK" ; }; @@ -2249,6 +2261,10 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "NEGBINOMDIST" ; }; + String SC_OPCODE_NEG_BINOM_DIST_MS + { + Text [ en-US ] = "NEGBINOM.DIST" ; + }; String SC_OPCODE_KRIT_BINOM { Text [ en-US ] = "CRITBINOM" ; @@ -2297,10 +2313,22 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "MODE" ; }; + String SC_OPCODE_MODAL_VALUE_MS + { + Text [ en-US ] = "MODE.SNGL" ; + }; + String SC_OPCODE_MODAL_VALUE_MULTI + { + Text [ en-US ] = "MODE.MULT" ; + }; String SC_OPCODE_Z_TEST { Text [ en-US ] = "ZTEST" ; }; + String SC_OPCODE_Z_TEST_MS + { + Text [ en-US ] = "Z.TEST" ; + }; String SC_OPCODE_T_TEST { Text [ en-US ] = "TTEST" ; |