sc/inc/scfuncs.hrc | 8 ++++----
sc/source/core/data/funcdesc.cxx | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1be7c7a3f200cab41cb718399e39e7e13e45aa2e
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Feb 12 14:06:48 2025 -0300
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Feb 12 23:10:49 2025 +0100
tdf#165119 Also fix # of param for VSTACK, HSTACK
+ based on https://gerrit.libreoffice.org/c/core/+/181439
Change-Id: I86c7e534bda881d84b47e81c9f36fd1cafbf59d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181506
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 8f9e795955b7..5987ef9d201f 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -4303,8 +4303,8 @@ const TranslateId SC_OPCODE_HSTACK_ARY[] =
NC_("SC_OPCODE_HSTACK", "Appends arrays horizontally to create a larger
array"),
NC_("SC_OPCODE_HSTACK", "Array"),
NC_("SC_OPCODE_HSTACK", "The first array to append."),
- NC_("SC_OPCODE_HSTACK", "Array 2"),
- NC_("SC_OPCODE_HSTACK", "Array 2, Array 3,... The following arrays to
append. if an array has fewer rows, #N/A error will be returned in the
additional rows."),
+ NC_("SC_OPCODE_HSTACK", "Array "),
+ NC_("SC_OPCODE_HSTACK", "Array 1, Array 2,... The following arrays to
append. If an array has fewer rows, #N/A error will be returned in the
additional rows."),
};
// -=*# Resource for function VSTACK #*=-
@@ -4313,8 +4313,8 @@ const TranslateId SC_OPCODE_VSTACK_ARY[] =
NC_("SC_OPCODE_VSTACK", "Appends arrays vertically to create a larger
array"),
NC_("SC_OPCODE_VSTACK", "Array"),
NC_("SC_OPCODE_VSTACK", "The first array to append."),
- NC_("SC_OPCODE_VSTACK", "Array 2"),
- NC_("SC_OPCODE_VSTACK", "Array 2, Array 3,... The following arrays to
append. if an array has fewer columns, #N/A error will be returned in the
additional columns."),
+ NC_("SC_OPCODE_VSTACK", "Array "),
+ NC_("SC_OPCODE_VSTACK", "Array 1, Array 2,... The following arrays to
append. If an array has fewer columns, #N/A error will be returned in the
additional columns."),
};
// -=*# Resource for function TAKE #*=-
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index a8eec7591813..995f4dd76103 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -797,8 +797,8 @@ ScFunctionList::ScFunctionList( bool bEnglishFunctionNames )
{ SC_OPCODE_CHOOSEROWS, ENTRY(SC_OPCODE_CHOOSEROWS_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_CHOOSEROWS_MS, VAR_ARGS + 1, { 0, 0 }, 0 },
{ SC_OPCODE_DROP, ENTRY(SC_OPCODE_DROP_ARY), 0, ID_FUNCTION_GRP_TABLE,
HID_FUNC_DROP_MS, 3, { 0, 0, 1 }, 0 },
{ SC_OPCODE_EXPAND, ENTRY(SC_OPCODE_EXPAND_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_EXPAND_MS, 4, { 0, 0, 1, 1 }, 0 },
- { SC_OPCODE_HSTACK, ENTRY(SC_OPCODE_HSTACK_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_HSTACK_MS, VAR_ARGS + 1, { 0, 1 }, 0 },
- { SC_OPCODE_VSTACK, ENTRY(SC_OPCODE_VSTACK_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_VSTACK_MS, VAR_ARGS + 1, { 0, 1 }, 0 },
+ { SC_OPCODE_HSTACK, ENTRY(SC_OPCODE_HSTACK_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_HSTACK_MS, VAR_ARGS + 1, { 0, 0 }, 0 },
+ { SC_OPCODE_VSTACK, ENTRY(SC_OPCODE_VSTACK_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_VSTACK_MS, VAR_ARGS + 1, { 0, 0 }, 0 },
{ SC_OPCODE_TAKE, ENTRY(SC_OPCODE_TAKE_ARY), 0, ID_FUNCTION_GRP_TABLE,
HID_FUNC_TAKE_MS, 3, { 0, 1, 1 }, 0 },
{ SC_OPCODE_TOCOL, ENTRY(SC_OPCODE_TOCOL_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_TOCOL_MS, 3, { 0, 1, 1 }, 0 },
{ SC_OPCODE_TOROW, ENTRY(SC_OPCODE_TOROW_ARY), 0,
ID_FUNCTION_GRP_TABLE, HID_FUNC_TOROW_MS, 3, { 0, 1, 1 }, 0 },
