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

[Dennis Francis]

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

New commits:
commit 574b06d36e3f0df1dfa1029e8d33473237807dcb
Author: Dennis Francis <dennis.francis at collabora.co.uk>
Date:   Fri Dec 15 12:18:55 2017 +0530

    tdf#114479 : Blacklist MATCH() for threading
    
    due to reasons similar to VLOOKUP/HLOOKUP
    
    Change-Id: I4eeefd37d87d19ed4c27c58cd661206ce916823a
    Reviewed-on: https://gerrit.libreoffice.org/46499
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.co.uk>
    (cherry picked from commit 2ba36f21bad74cbbd68611afddaf9bbdc8ffda50)
    Reviewed-on: https://gerrit.libreoffice.org/46510
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

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