sc/source/core/tool/token.cxx | 1 + 1 file changed, 1 insertion(+) New commits: commit 7fb235b21d43f3afa340dfeb53efffd516ee21fd Author: Luboš Luňák <l.lu...@collabora.com> AuthorDate: Wed Nov 7 16:11:05 2018 +0100 Commit: Luboš Luňák <l.lu...@collabora.com> CommitDate: Wed Nov 14 16:08:28 2018 +0100
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.lu...@collabora.com> 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, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits