summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2016-04-27 13:09:27 +0200
committerEike Rathke <erack@redhat.com>2016-05-03 16:10:12 +0000
commit29433c6496e8aa2d82ce56731d4bb734538a9f80 (patch)
tree1743a426b796bd669f0d27d4e2e5dedbabf17719 /formula
parent04baf07416aefe7afccec8e45e620bf16643eadb (diff)
tdf#97831 [part] Add Excel 2016 functions to Calc
Functions IFS and SWITCH. Change-Id: Ic43d42a933bcac883e9aa2213dd4ddeddf45abf0 Reviewed-on: https://gerrit.libreoffice.org/24424 Tested-by: Jenkins <ci@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/resource/core_resource.src14
1 files changed, 14 insertions, 0 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index b966192a57a0..acc6ba899dab 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -289,6 +289,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_CONCAT { Text = "CONCATENATE" ; };
String SC_OPCODE_CONCAT_MS { Text = "COM.MICROSOFT.CONCAT" ; };
String SC_OPCODE_TEXTJOIN_MS { Text = "COM.MICROSOFT.TEXTJOIN" ; };
+ String SC_OPCODE_IFS_MS { Text = "COM.MICROSOFT.IFS" ; };
+ String SC_OPCODE_SWITCH_MS { Text = "COM.MICROSOFT.SWITCH" ; };
String SC_OPCODE_MAT_VALUE { Text = "MVALUE" ; };
String SC_OPCODE_MAT_DET { Text = "MDETERM" ; };
String SC_OPCODE_MAT_INV { Text = "MINVERSE" ; };
@@ -725,6 +727,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_CONCAT { Text = "CONCATENATE" ; };
String SC_OPCODE_CONCAT_MS { Text = "_xlfn.CONCAT" ; };
String SC_OPCODE_TEXTJOIN_MS { Text = "_xlfn.TEXTJOIN" ; };
+ String SC_OPCODE_IFS_MS { Text = "_xlfn.IFS" ; };
+ String SC_OPCODE_SWITCH_MS { Text = "_xlfn.SWITCH" ; };
String SC_OPCODE_MAT_VALUE { Text = "MVALUE" ; };
String SC_OPCODE_MAT_DET { Text = "MDETERM" ; };
String SC_OPCODE_MAT_INV { Text = "MINVERSE" ; };
@@ -1161,6 +1165,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_CONCAT { Text = "CONCATENATE" ; };
String SC_OPCODE_CONCAT_MS { Text = "CONCAT" ; };
String SC_OPCODE_TEXTJOIN_MS { Text = "TEXTJOIN" ; };
+ String SC_OPCODE_IFS_MS { Text = "IFS" ; };
+ String SC_OPCODE_SWITCH_MS { Text = "SWITCH" ; };
String SC_OPCODE_MAT_VALUE { Text = "MVALUE" ; };
String SC_OPCODE_MAT_DET { Text = "MDETERM" ; };
String SC_OPCODE_MAT_INV { Text = "MINVERSE" ; };
@@ -2335,6 +2341,14 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "TEXTJOIN" ;
};
+ String SC_OPCODE_IFS_MS
+ {
+ Text [ en-US ] = "IFS" ;
+ };
+ String SC_OPCODE_SWITCH_MS
+ {
+ Text [ en-US ] = "SWITCH" ;
+ };
String SC_OPCODE_MAT_VALUE
{
Text [ en-US ] = "MVALUE" ;