Use CompileFormulaContext in CompileDBFormula() and CalcAfterLoad().

Also make some adjustment in order to handle formula cell's "temp grammar"
correctly.

Change-Id: I6fdd5c67bb95e4de90ea71db624c9610c1e2febf

1 files changed, 11 insertions, 1 deletions

diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index fcc7eae42acf..af97d999c37e 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -46,13 +46,23 @@ struct SC_DLLPUBLIC TokenStringContext
     TokenStringContext( const ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram );
 };
 
-struct CompileFormulaContext
+class CompileFormulaContext
 {
     ScDocument* mpDoc;
     formula::FormulaGrammar::Grammar meGram;
     std::vector<OUString> maTabNames;
 
+    void updateTabNames();
+
+public:
     CompileFormulaContext( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram );
+
+    formula::FormulaGrammar::Grammar getGrammar() const;
+    void setGrammar( formula::FormulaGrammar::Grammar eGram );
+
+    const std::vector<OUString>& getTabNames() const;
+
+    ScDocument* getDoc();
 };
 
 }