[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source
Luboš Luňák
l.lunak at collabora.com
Mon Jun 25 13:33:13 UTC 2018
sc/source/core/tool/token.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c8d3f7210f7a0daa265d71d9b034fae30a31916b
Author: Luboš Luňák <l.lunak at collabora.com>
Date: Thu Jun 21 16:26:35 2018 +0200
blacklist ocDde and ocWebservice for calc's threading
fdo#35927-1 (with minimal formula size disabled) crashes
in LinkManager::CloseCachedComps(). The whole LinkManager class feels
thread-unsafe, so just blacklist.
Change-Id: Idd7ec6b47f5269c977b600dadfc3a05a5287a86d
Reviewed-on: https://gerrit.libreoffice.org/56241
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
Tested-by: Luboš Luňák <l.lunak at collabora.com>
(cherry picked from commit 0a4a42e98479996b2f3bb19a884c057518fece4f)
Reviewed-on: https://gerrit.libreoffice.org/56372
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 4848afef0b01..f7f285e488ad 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1321,7 +1321,9 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
ocInfo,
ocStyle,
ocDBSum,
- ocExternal
+ ocExternal,
+ ocDde,
+ ocWebservice
});
// Don't enable threading once we decided to disable it.
More information about the Libreoffice-commits
mailing list