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

[Eike Rathke]

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

New commits:
commit a6ada5480eb165c3b0b3d8d5333c9cbf434b11ff
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Dec 16 01:36:16 2017 +0100

    Blacklist CELL() and INFO() for threading
    
    They access one utl::TransliterationWrapper via
    ScCellKeywordTranslator::transKeyword() for the localized
    keywords.
    
    Change-Id: Ia3c1ec8def761b3448d6be4c81d42723e1a28ea2
    (cherry picked from commit cef05fdcf8453cf6a799234de55182d5f51dde70)
    Reviewed-on: https://gerrit.libreoffice.org/46581
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 709d00e3e2ad..fe1682bd74e7 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1345,7 +1345,9 @@ void ScTokenArray::CheckForThreading( OpCode eOp  )
         ocTableOp,
         ocVLookup,
         ocHLookup,
-        ocMatch
+        ocMatch,
+        ocCell,
+        ocInfo
     });
 
     // We only call this if it was already disabled