From cd7243cd2a1d7790832fbd7cfd43d1870b6c544a Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 20 Aug 2020 01:12:05 +0200 Subject: Resolves: tdf#109409 TEXTJOIN() CONCAT() handle array/matrix row-wise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... like references, instead of column-wise. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101034 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit ff3955db7161b8644699d7a0128ec4a6e7e525ec) merge conflicts: sc/source/core/tool/interpr8.cxx Change-Id: If3ada9b197dd15c95b0da50464c70844fb7685ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101058 Reviewed-by: Christian Lohmaier Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/source/core/tool/interpr8.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 9fc1e799884a..92ea9ab1ac11 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1474,9 +1474,9 @@ void ScInterpreter::ScConcat_MS() SetError(FormulaError::IllegalArgument); else { - for ( SCSIZE j = 0; j < nC; j++ ) + for (SCSIZE k = 0; k < nR; ++k) { - for (SCSIZE k = 0; k < nR; k++ ) + for (SCSIZE j = 0; j < nC; ++j) { if ( pMat->IsStringOrEmpty( j, k ) ) { @@ -1602,9 +1602,9 @@ void ScInterpreter::ScTextJoin_MS() SetError(FormulaError::IllegalArgument); else { - for ( SCSIZE j = 0; j < nC; j++ ) + for (SCSIZE k = 0; k < nR; ++k) { - for (SCSIZE k = 0; k < nR; k++ ) + for (SCSIZE j = 0; j < nC; ++j) { if ( !pMat->IsEmpty( j, k ) ) { @@ -1782,9 +1782,9 @@ void ScInterpreter::ScTextJoin_MS() else { OUString aStr; - for ( SCSIZE j = 0; j < nC; j++ ) + for (SCSIZE k = 0; k < nR; ++k) { - for (SCSIZE k = 0; k < nR; k++ ) + for (SCSIZE j = 0; j < nC; ++j) { if ( !pMat->IsEmpty( j, k ) ) { -- cgit