formula/source/core/api/FormulaCompiler.cxx | 1 +
sc/inc/scfuncs.hrc | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e5361d0ef04bc63e7809323750aabe6efafcaef9
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Thu Mar 14 21:16:01 2024 +0100
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Fri Mar 15 12:38:13 2024 +0100
Related: tdf#126573 Add Excel2021 array function FILTER to Calc
Add ocFilter to matrix (array) functions.
Some follow-up cosmetic clean.
Follow up commit of b0791dd9216224bdb266fd0d8c87df253b6d0583
Change-Id: I4c3c786fe14ab870be8c43211ca6a76c5ff6ac6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164847
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index dc9c73d7937d..1bf29d2b44e4 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1230,6 +1230,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode )
case ocMatrixUnit :
case ocModalValue_Multi :
case ocFourier :
+ case ocFilter :
return true;
default:
{
diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index e7213f028491..5fa1c12808c1 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -4187,12 +4187,12 @@ const TranslateId SC_OPCODE_RANDBETWEEN_NV_ARY[] =
const TranslateId SC_OPCODE_FILTER_ARY[] =
{
NC_("SC_OPCODE_FILTER", "Filters an array based on a Boolean (True/False)
array."),
- NC_("SC_OPCODE_FILTER", "Range "),
+ NC_("SC_OPCODE_FILTER", "Range"),
NC_("SC_OPCODE_FILTER", "The array, or range to filter."),
NC_("SC_OPCODE_FILTER", "Include"),
NC_("SC_OPCODE_FILTER", "A Boolean array whose height or width is the same
as the array."),
NC_("SC_OPCODE_FILTER", "Result if empty"),
- NC_("SC_OPCODE_FILTER", "The value to return if all values in the included
array are empty (filter returns nothing)")
+ NC_("SC_OPCODE_FILTER", "The value to return if all values in the included
array are empty (filter returns nothing).")
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
