[Libreoffice-commits] core.git: sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 4aecbe996349c7767ba3fb1e81db2ef6f94d39ba
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Sep 5 13:54:50 2018 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Sep 8 15:34:31 2018 +0200

    blacklist all ocDB* tokens for Calc threading
    
    A sort of follow-up to 92e6be6614, all functions possibly may have
    this problem. E.g. sc_opencl_test, if it somehow ends up actually
    using threads instead of OpenCL, uses ocDBCount, which indirectly
    ends up in ScColumn::GetInputString() calling non-threaded context.
    
    Change-Id: I6e2b1c9aa6dc9a7d8732cdf2e86b8041f19d5bac
    Reviewed-on: https://gerrit.libreoffice.org/60030
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 89bc5fdf3dcc..618a39879a0a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1289,7 +1289,18 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
         ocCell,
         ocInfo,
         ocStyle,
+        ocDBAverage,
+        ocDBCount,
+        ocDBCount2,
+        ocDBGet,
+        ocDBMax,
+        ocDBMin,
+        ocDBProduct,
+        ocDBStdDev,
+        ocDBStdDevP,
         ocDBSum,
+        ocDBVar,
+        ocDBVarP,
         ocText,
         ocExternal,
         ocDde,