[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
Eike Rathke (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 13 06:42:02 UTC 2020
sc/source/core/tool/token.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 905f16f6f0e8ef356bc5fe5a35708b0cc5407135
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Tue May 12 23:33:12 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed May 13 08:41:29 2020 +0200
Resolves: tdf#132173 handle API sequence to inline array token correctly
The API token of an inline array is always a two dimensional matrix.
Regression from
commit 3f80ac477354f4c6293d983d3ca9eef59a07dce0
CommitDate: Wed Apr 1 08:40:39 2015 +0200
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I9ab2a807d29847fb843625b898ab8bbd005fab2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94085
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit 5f5afecda386642aabf2365130629b6a237bf953)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93996
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1b141b207c76..6617ccc13656 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1256,7 +1256,7 @@ bool ScTokenArray::AddFormulaToken(
if ( eOpCode != ocPush )
bError = true; // not an inline array
else if (!rToken.Data.getValueType().equals( cppu::UnoType<
- uno::Sequence< uno::Any >>::get()))
+ uno::Sequence< uno::Sequence< uno::Any >>>::get()))
bError = true; // unexpected sequence type
else
{
More information about the Libreoffice-commits
mailing list