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

[Andreas Heinisch (via logerrit)]

 sc/source/ui/unoobj/cellsuno.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit bc412136e4325b9b615afdd864c61488fd1ffdcc
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Thu Nov 4 11:50:51 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Nov 9 13:49:27 2021 +0100

    tdf#142033 - Handle embedded newline set via SetDataArray
    
    Change-Id: I798f9a2a2ce599ba8ca3ef1f5ae91801d8f1b138
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124681
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <er...@redhat.com>
    (cherry picked from commit b9e2c5d2a36fbd189c20448cadf4212edf02914d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124858
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 1922781652d5..29d3b29086da 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1098,6 +1098,7 @@ static bool lcl_PutDataArray( ScDocShell& rDocShell, 
const ScRange& rRange,
                         const uno::Sequence< uno::Sequence<uno::Any> >& aData )
 {
     ScDocument& rDoc = rDocShell.GetDocument();
+    ScDocFunc& rDocFunc = rDocShell.GetDocFunc();
     SCTAB nTab = rRange.aStart.Tab();
     SCCOL nStartCol = rRange.aStart.Col();
     SCROW nStartRow = rRange.aStart.Row();
@@ -1174,9 +1175,7 @@ static bool lcl_PutDataArray( ScDocShell& rDocShell, 
const ScRange& rRange,
                         rElement >>= aUStr;
                         if ( !aUStr.isEmpty() )
                         {
-                            ScSetStringParam aParam;
-                            aParam.setTextInput();
-                            rDoc.SetString(aPos, aUStr, &aParam);
+                            rDocFunc.SetStringOrEditCell(aPos, aUStr, false);
                         }
                     }
                     break;