diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2018-11-16 19:42:03 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2018-12-04 17:44:15 +0100 |
| commit | e28b719ee82354d6cef0847d9dd601d1a0423460 (patch) | |
| tree | 253c419d641dee04f6254246452e4f51adf97bb9 /sc | |
| parent | 0351f5b78795d1fbd52e1d073d7e50dc70626ecf (diff) | |
make sure opencl is not used from withing ocTableOp
Table operations do some tricks with reusing a cell with different values,
and this confuses opencl handling, which operates on a group as a whole.
Possibly relevant only with SC_FORCE_CALCULATION=opencl,
sc_subsequent_filters_test fails in testDataTableOneVarXLSX().
Change-Id: I55e0d238061c8a45a2388ccf6c769ff6a1fddbcc
Reviewed-on: https://gerrit.libreoffice.org/64230
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 43922f1aaa3d7bced4b02f6662c5c12ee698132f)
Reviewed-on: https://gerrit.libreoffice.org/64460
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index b45e04873cd1..c3f12663b3c3 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -4757,6 +4757,10 @@ bool ScFormulaCell::InterpretFormulaGroupOpenCL(sc::FormulaLogger::GroupScope& a return false; } + // TableOp does tricks with using a cell with different values, just bail out. + if(pDocument->IsInInterpreterTableOp()) + return false; + if (bDependencyCheckFailed) return false; |