Let's have makeRefStr() take individual parameters again.

And remove use of TokenStringContext from ScCompiler.

Change-Id: Ib0636e2437a64edd372623a7176dab462eed831b

sc/inc/compiler.hxx

@@ -78,12 +78,6 @@ class ScRangeData;
 class ScExternalRefManager;
 class ScTokenArray;
 
-namespace sc {
-
-struct TokenStringContext;
-
-}
-
 // constants and data types internal to compiler
 
 /*
@@ -241,7 +235,10 @@ public:
         virtual ~Convention();
 
         virtual void makeRefStr(
-            OUStringBuffer& rBuffer, const ScAddress& rPos, const sc::TokenStringContext& rCxt,
+            OUStringBuffer& rBuffer,
+            formula::FormulaGrammar::Grammar eGram,
+            const ScAddress& rPos,
+            const OUString& rErrRef, const std::vector<OUString>& rTabNames,
             const ScComplexRefData& rRef, bool bSingleRef ) const = 0;
 
         virtual ::com::sun::star::i18n::ParseResult
@@ -338,7 +335,7 @@ private:
     bool        mbCloseBrackets;            // whether to close open brackets automatically, default TRUE
     bool        mbRewind;                   // whether symbol is to be rewound to some step during lexical analysis
     std::vector<sal_uInt16> maExternalFiles;
-    mutable sc::TokenStringContext* mpTokenStringCxt;
+    std::vector<OUString> maTabNames;
 
     bool   NextNewToken(bool bInArray = false);
 

sc/source/core/tool/token.cxx

@@ -3242,7 +3242,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
                 ScComplexRefData aRef;
                 aRef.Ref1 = rRef;
                 aRef.Ref2 = rRef;
-                rCxt.mpRefConv->makeRefStr(rBuf, rPos, rCxt, aRef, true);
+                rCxt.mpRefConv->makeRefStr(rBuf, rCxt.meGram, rPos, rCxt.maErrRef, rCxt.maTabNames, aRef, true);
             }
             else
                 rBuf.append(rCxt.maErrRef);
@@ -3253,7 +3253,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
             if (rCxt.mpRefConv)
             {
                 const ScComplexRefData& rRef = static_cast<const ScToken&>(rToken).GetDoubleRef();
-                rCxt.mpRefConv->makeRefStr(rBuf, rPos, rCxt, rRef, false);
+                rCxt.mpRefConv->makeRefStr(rBuf, rCxt.meGram, rPos, rCxt.maErrRef, rCxt.maTabNames, rRef, false);
             }
             else
                 rBuf.append(rCxt.maErrRef);