From c78b58e1a1950ea78dc0f9a5d8abe2fc228b08c2 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 3 Nov 2014 14:04:51 +0200
Subject: Check also unary and binary operation opcodes for presence in subset

Change-Id: I316ebdb017d512e72d0ad15a847802bca0e15814
---
 sc/source/core/tool/token.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'sc')

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 46fd5a4e8331..93c3463eaafe 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1454,6 +1454,16 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             default:
                 ;
         }
+        return;
+    }
+
+    if (eOp >= SC_OPCODE_START_BIN_OP &&
+        eOp <= SC_OPCODE_STOP_UN_OP &&
+        ScInterpreter::GetGlobalConfig().mbOpenCLSubsetOnly &&
+        ScInterpreter::GetGlobalConfig().maOpenCLSubsetFunctions.find(eOp) == ScInterpreter::GetGlobalConfig().maOpenCLSubsetFunctions.end())
+    {
+        meVectorState = FormulaVectorDisabled;
+        return;
     }
 }
 
-- 
cgit