summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2018-11-07 16:11:05 +0100
committerLuboš Luňák <l.lunak@collabora.com>2018-11-14 16:08:28 +0100
commit7fb235b21d43f3afa340dfeb53efffd516ee21fd (patch)
tree4a1d164bdf24e422e8b255e5355a3e9df4bbbbdf /sc/source
parent2dbda86cca1301b81a4232a6f0c03559da5ed7f4 (diff)
blacklist ocMatch for calc threading
It calls ScDocument::IsInVBAMode(), which eventually leads to trying to acquire the SolarMutex, which deadlocks (since the main thread keeps it the whole time). Change-Id: I7f05597ca3c1f5667c9a6527dc7421da3c3e075e Reviewed-on: https://gerrit.libreoffice.org/63185 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/tool/token.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 42484f1979c1..474730050d72 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1284,6 +1284,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
ocOffset,
ocTableOp,
ocCell,
+ ocMatch,
ocInfo,
ocStyle,
ocDBAverage,