Remove global variable SymbolTable::nR and make the code re-entrant.

Change-Id: Ie4cc8329398063b82b34cde5568686f48363ee1a

sc/inc/formulagroup.hxx

@@ -133,10 +133,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
     static void getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& rPlatformId);
 #endif
     virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0;
-    virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
-                                                   const ScAddress& rTopPos,
-                                                   ScFormulaCellGroup& rGroup,
-                                                   ScTokenArray& rCode) = 0;
+    virtual CompiledFormula* createCompiledFormula( ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) = 0;
     virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) = 0;
 };
 
@@ -148,10 +145,7 @@ public:
     virtual ~FormulaGroupInterpreterSoftware() {}
 
     virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) SAL_OVERRIDE;
-    virtual CompiledFormula* createCompiledFormula(ScDocument& rDoc,
-                                                   const ScAddress& rTopPos,
-                                                   ScFormulaCellGroup& rGroup,
-                                                   ScTokenArray& rCode) SAL_OVERRIDE;
+    virtual CompiledFormula* createCompiledFormula( ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) SAL_OVERRIDE;
     virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) SAL_OVERRIDE;
 };
 

sc/source/core/data/formulacell.cxx

@@ -546,8 +546,8 @@ void ScFormulaCellGroup::compileOpenCLKernel()
     if (meCalcState == sc::GroupCalcDisabled)
         return;
 
-    mpCompiledFormula = sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(
-        *mpTopCell->GetDocument(), mpTopCell->aPos, *this, *mpCode);
+    mpCompiledFormula =
+        sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(*this, *mpCode);
 
     meKernelState = sc::OpenCLKernelBinaryCreated;
 }

sc/source/core/inc/formulagroupcl.hxx

@@ -17,19 +17,12 @@ namespace sc { namespace opencl {
 class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreter
 {
 public:
-    FormulaGroupInterpreterOpenCL() :
-        FormulaGroupInterpreter()
-    {
-    }
-    virtual ~FormulaGroupInterpreterOpenCL()
-    {
-    }
+    FormulaGroupInterpreterOpenCL();
+    virtual ~FormulaGroupInterpreterOpenCL();
 
     virtual ScMatrixRef inverseMatrix( const ScMatrix& rMat ) SAL_OVERRIDE;
-    virtual CompiledFormula* createCompiledFormula( ScDocument& rDoc,
-        const ScAddress& rTopPos,
-        ScFormulaCellGroup& rGroup,
-        ScTokenArray& rCode ) SAL_OVERRIDE;
+    virtual CompiledFormula* createCompiledFormula(
+        ScFormulaCellGroup& rGroup, ScTokenArray& rCode ) SAL_OVERRIDE;
     virtual bool interpret( ScDocument& rDoc, const ScAddress& rTopPos,
         ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode ) SAL_OVERRIDE;
 };

sc/source/core/tool/formulagroup.cxx

@@ -302,10 +302,8 @@ ScMatrixRef FormulaGroupInterpreterSoftware::inverseMatrix(const ScMatrix& /*rMa
     return ScMatrixRef();
 }
 
-CompiledFormula* FormulaGroupInterpreterSoftware::createCompiledFormula(ScDocument& /* rDoc */,
-                                                                        const ScAddress& /* rTopPos */,
-                                                                        ScFormulaCellGroup& /* rGroup */,
-                                                                        ScTokenArray& /* rCode */)
+CompiledFormula* FormulaGroupInterpreterSoftware::createCompiledFormula(
+    ScFormulaCellGroup& /*rGroup*/, ScTokenArray& /*rCode*/ )
 {
     return NULL;
 }