sc/inc/tokenarray.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 3689c9c67084b6fbf8938f7d7dc4c2a4981831aa Author: Luboš Luňák <l.lu...@collabora.com> Date: Mon Jun 18 14:15:24 2018 +0200 do not make calc's threading depend on opencl This should have been part of e0e21f2747c19dae13332f4e59949c717aa114f3. Change-Id: I5942b9a907f876ff7173971b27f72b8a6c97f8dc diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index f5f9a3d3c65a..feac9acf32f6 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -265,7 +265,7 @@ public: sal_Int32 GetWeight() const; bool IsEnabledForOpenCL() const { return mbOpenCLEnabled; } - bool IsEnabledForThreading() const { return !mbOpenCLEnabled && mbThreadingEnabled; } + bool IsEnabledForThreading() const { return mbThreadingEnabled; } #if DEBUG_FORMULA_COMPILER void Dump() const; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits