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

[Libreoffice Gerrit user]

 sc/source/core/tool/token.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit d76b64ad538f05afc5f18041e9d8c375f22be356
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Sep 10 12:35:26 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Wed Sep 12 09:07:11 2018 +0200

    sync opcodes blacklisted for calc threading from master
    
    This makes the branch use the same blacklist, i.e.
    commits 4aecbe996349c7767ba3fb1e81db2ef6f94d39ba
    and fbd79a36ca8110e37434bb2eb5cc83e892710392.
    
    Change-Id: I85ae8e79ee5285f26a5594ad2fddd4a37284afd0
    Reviewed-on: https://gerrit.libreoffice.org/60254
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8d6fd7351aa2..db03b6a3f649 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1320,7 +1320,19 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
         ocCell,
         ocInfo,
         ocStyle,
+        ocDBAverage,
+        ocDBCount,
+        ocDBCount2,
+        ocDBGet,
+        ocDBMax,
+        ocDBMin,
+        ocDBProduct,
+        ocDBStdDev,
+        ocDBStdDevP,
         ocDBSum,
+        ocDBVar,
+        ocDBVarP,
+        ocText,
         ocExternal,
         ocDde,
         ocWebservice,