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

[Eike Rathke (via logerrit)]

 sc/source/core/tool/interpr8.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cd7243cd2a1d7790832fbd7cfd43d1870b6c544a
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Thu Aug 20 01:12:05 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 27 20:33:15 2020 +0200

    Resolves: tdf#109409 TEXTJOIN() CONCAT() handle array/matrix row-wise
    
    ... like references, instead of column-wise.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101034
    Reviewed-by: Eike Rathke <erack at redhat.com>
    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 <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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 ) )
                                     {