Have makeRefStr() accept a context object rather than individual params.

Change-Id: Id52e02aa29d85d207420c80a95ada2f8487f165f

sc/inc/compiler.hxx

@@ -78,6 +78,12 @@ class ScRangeData;
 class ScExternalRefManager;
 class ScTokenArray;
 
+namespace sc {
+
+struct TokenStringContext;
+
+}
+
 // constants and data types internal to compiler
 
 /*
@@ -235,8 +241,7 @@ public:
         virtual ~Convention();
 
         virtual void makeRefStr(
-            OUStringBuffer& rBuffer, const ScAddress& rPos, formula::FormulaGrammar::Grammar eGram,
-            const OUString& rErrRef, const std::vector<OUString>& rTabNames,
+            OUStringBuffer& rBuffer, const ScAddress& rPos, const sc::TokenStringContext& rCxt,
             const ScComplexRefData& rRef, bool bSingleRef ) const = 0;
 
         virtual ::com::sun::star::i18n::ParseResult
@@ -333,6 +338,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;
 
     bool   NextNewToken(bool bInArray = false);
 
@@ -370,6 +376,8 @@ public:
 
     ScCompiler( ScDocument* pDocument, const ScAddress&,ScTokenArray& rArr);
 
+    virtual ~ScCompiler();
+
 public:
     static void DeInit();               /// all
 

sc/source/core/tool/token.cxx

@@ -3241,7 +3241,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons
                 ScComplexRefData aRef;
                 aRef.Ref1 = rRef;
                 aRef.Ref2 = rRef;
-                rCxt.mpRefConv->makeRefStr(rBuf, rPos, rCxt.meGram, rCxt.maErrRef, rCxt.maTabNames, aRef, true);
+                rCxt.mpRefConv->makeRefStr(rBuf, rPos, rCxt, aRef, true);
             }
             else
                 rBuf.append(rCxt.maErrRef);
@@ -3252,7 +3252,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.meGram, rCxt.maErrRef, rCxt.maTabNames, rRef, false);
+                rCxt.mpRefConv->makeRefStr(rBuf, rPos, rCxt, rRef, false);
             }
             else
                 rBuf.append(rCxt.maErrRef);