[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Luboš Luňák]

 sc/source/core/tool/token.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2c7a550a1e752f7add05381ae5932e1b00d705a5
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Wed Jun 27 14:14:38 2018 +0200

    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 at collabora.com>
    (cherry picked from commit 7e1cabd96526cb7befc5ea5073358093efbe12d0)
    Reviewed-on: https://gerrit.libreoffice.org/56565
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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.