diff options
author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2016-03-29 19:03:43 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-04-26 15:08:22 +0000 |
commit | a76c5e21378e5364f1f7554a32d89072feff8b0c (patch) | |
tree | ca65eb9aae585323ab033bbab08e4265d5359fa3 /formula | |
parent | 0bdb8baf57ac243f574db6273eed70127379e3fc (diff) |
tdf#97831 [part] Add Excel 2016-Office 365 functions to Calc
Functions CONCAT and TEXTJOIN.
Change-Id: I38092f77df719d11f6746ac10fe14dc53b7e93e7
Reviewed-on: https://gerrit.libreoffice.org/23601
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.src | 14 |
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 bf496242aa30..b966192a57a0 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -287,6 +287,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_SUBSTITUTE { Text = "SUBSTITUTE" ; }; String SC_OPCODE_REPT { Text = "REPT" ; }; 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_MAT_VALUE { Text = "MVALUE" ; }; String SC_OPCODE_MAT_DET { Text = "MDETERM" ; }; String SC_OPCODE_MAT_INV { Text = "MINVERSE" ; }; @@ -721,6 +723,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_SUBSTITUTE { Text = "SUBSTITUTE" ; }; String SC_OPCODE_REPT { Text = "REPT" ; }; 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_MAT_VALUE { Text = "MVALUE" ; }; String SC_OPCODE_MAT_DET { Text = "MDETERM" ; }; String SC_OPCODE_MAT_INV { Text = "MINVERSE" ; }; @@ -1155,6 +1159,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_SUBSTITUTE { Text = "SUBSTITUTE" ; }; String SC_OPCODE_REPT { Text = "REPT" ; }; String SC_OPCODE_CONCAT { Text = "CONCATENATE" ; }; + String SC_OPCODE_CONCAT_MS { Text = "CONCAT" ; }; + String SC_OPCODE_TEXTJOIN_MS { Text = "TEXTJOIN" ; }; String SC_OPCODE_MAT_VALUE { Text = "MVALUE" ; }; String SC_OPCODE_MAT_DET { Text = "MDETERM" ; }; String SC_OPCODE_MAT_INV { Text = "MINVERSE" ; }; @@ -2321,6 +2327,14 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "CONCATENATE" ; }; + String SC_OPCODE_CONCAT_MS + { + Text [ en-US ] = "CONCAT" ; + }; + String SC_OPCODE_TEXTJOIN_MS + { + Text [ en-US ] = "TEXTJOIN" ; + }; String SC_OPCODE_MAT_VALUE { Text [ en-US ] = "MVALUE" ; |