diff options
| author | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2021-11-04 11:50:51 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-11-09 13:49:27 +0100 |
| commit | bc412136e4325b9b615afdd864c61488fd1ffdcc (patch) | |
| tree | 266b47e30838e9c520ae5959e1df270fc6d5eba1 /sc | |
| parent | fc8e53e48e1c690de4aa4dce0fee385b1f7adf73 (diff) | |
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 <erack@redhat.com>
(cherry picked from commit b9e2c5d2a36fbd189c20448cadf4212edf02914d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124858
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
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; |