summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-04-20 13:52:18 +0200
committerAndras Timar <andras.timar@collabora.com>2017-05-04 12:48:35 +0200
commit28fa71b6a85b0c293659480bfec904ea2f9307a1 (patch)
treee89381a21fedc6b0945a182d5c225737299b33e6 /sc
parentd10468524bd6f94b84c6f4eb90fc2bb7b4fec73c (diff)
Resolves: tdf#99625 add parameter classification for TEXTJOIN and CONCAT
So in array context the functions return a single string instead of an array of identical strings. Change-Id: Ia6ada10be4912745b60e281fac1736c560162d3a (cherry picked from commit f0fef88b747cc4f4de7a5ccb93da9c062545dcfb) Reviewed-on: https://gerrit.libreoffice.org/36742 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 9e76cc9da61dbe8ee5bbcac5c4378c5ba4fb4d21)
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/parclass.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index bd8ca5544a8d..66ca8e5c3a48 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -80,6 +80,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
{ ocCell, {{ Value, Reference }, 0 }},
{ ocColumn, {{ Reference }, 0 }},
{ ocColumns, {{ Reference }, 1 }},
+ { ocConcat_MS, {{ Reference }, 1 }},
{ ocCorrel, {{ ForceArray, ForceArray }, 0 }},
{ ocCount, {{ Reference }, 1 }},
{ ocCount2, {{ Reference }, 1 }},
@@ -195,6 +196,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
{ ocSumXMY2, {{ ForceArray, ForceArray }, 0 }},
{ ocSheet, {{ Reference }, 0 }},
{ ocSheets, {{ Reference }, 1 }},
+ { ocTextJoin_MS, {{ Reference, Value, Reference }, 1 }},
{ ocTrend, {{ Reference, Reference, Reference, Value }, 0 }},
{ ocTrimMean, {{ Reference, Value }, 0 }},
{ ocTTest, {{ ForceArray, ForceArray, Value, Value }, 0 }},