diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2018-09-05 13:54:50 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-09-08 15:34:31 +0200 |
| commit | 4aecbe996349c7767ba3fb1e81db2ef6f94d39ba (patch) | |
| tree | 7a1f1dafb107d798adea231db361e3b63c51b284 | |
| parent | 1da0940a603bf8fc1350586d61f747f0325d7967 (diff) | |
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@collabora.com>
| -rw-r--r-- | sc/source/core/tool/token.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
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, |