diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-15 11:28:48 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-11-18 17:25:37 -0500 |
| commit | f79537242c069668d4d2fb616e22f00b9b0153ee (patch) | |
| tree | b66873897db4599814d0125172fc51ad6d6fa518 /sc/inc | |
| parent | c32045fcf3045024245525b585f3cad0f4b21686 (diff) | |
Have makeRefStr() accept a context object rather than individual params.
Change-Id: Id52e02aa29d85d207420c80a95ada2f8487f165f
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/compiler.hxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 6844b283e840..ee3c68981d39 100644 --- a/sc/inc/compiler.hxx +++ b/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 |