summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2018-06-27 14:14:38 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-03 17:44:10 +0200
commit2c7a550a1e752f7add05381ae5932e1b00d705a5 (patch)
tree166f2c2981e2daf231111be702962c173b7f8d0f /sc
parentee0d0b0d21889441dec04c3b17fc99087cf8ef96 (diff)
blacklist ocGetPivotData for calc's threading
There appears to be a lot of caching involved in the code invoked by ScGetPivotData(). Testcase is e.g. tdf#89186-1 (with minimal formula size disabled again). Change-Id: If7e2a972898c358dc8f80cf238f8d5ccf541f16d Reviewed-on: https://gerrit.libreoffice.org/56525 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 7e1cabd96526cb7befc5ea5073358093efbe12d0) Reviewed-on: https://gerrit.libreoffice.org/56565 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/token.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f7f285e488ad..691188f80d33 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1323,7 +1323,8 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
ocDBSum,
ocExternal,
ocDde,
- ocWebservice
+ ocWebservice,
+ ocGetPivotData
});
// Don't enable threading once we decided to disable it.