diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2018-09-10 12:35:26 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-12 09:07:11 +0200 |
| commit | d76b64ad538f05afc5f18041e9d8c375f22be356 (patch) | |
| tree | 15b432bdf2ce9d54220cbea15acfef5f1dffc543 | |
| parent | ea0e3b2d657c1d3183e16d72f9b7188a048deabe (diff) | |
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@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | sc/source/core/tool/token.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
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, |