Check also unary and binary operation opcodes for presence in subset

Change-Id: I316ebdb017d512e72d0ad15a847802bca0e15814

1 files changed, 10 insertions, 0 deletions

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;
     }
 }