[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-7' - sc/source

[Eike Rathke]

 sc/source/core/tool/parclass.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 611e94e56159f2753f1753c3d78ba1b528196c18
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 20 13:52:18 2017 +0200

    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/36746
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

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 }},