diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-05 22:26:11 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-12 19:46:24 -0400 |
| commit | 86a2dc96c7ce312f251b5a063c2aa8332c8817a0 (patch) | |
| tree | 6d2660f08e8639b64d2e4d8171bdd5ac67776aa0 /sc/inc | |
| parent | f4b757d7e7a3f5bc23fea3e540671b0f40133f24 (diff) | |
Prepare for importing shared formulas as formula groups from xls.
Still the first step.
Change-Id: I1897c9c2cd3a5b5245febbfba76e1b088054f578
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/formulacell.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 1213959d9420..648005692899 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -47,6 +47,7 @@ struct SC_DLLPUBLIC ScFormulaCellGroup { mutable size_t mnRefCount; + ScTokenArray* mpCode; SCROW mnStart; // Start offset of that cell SCROW mnLength; // How many of these do we have ? bool mbInvariant; @@ -77,6 +78,7 @@ enum ScMatrixMode { class SC_DLLPUBLIC ScFormulaCell : public SvtListener { private: + ScFormulaCellGroupRef mxGroup; // re-factoring hack - group of formulae we're part of. ScFormulaResult aResult; formula::FormulaGrammar::Grammar eTempGrammar; // used between string (creation) and (re)compilation ScTokenArray* pCode; // The (new) token array @@ -85,7 +87,6 @@ private: ScFormulaCell* pNext; ScFormulaCell* pPreviousTrack; ScFormulaCell* pNextTrack; - ScFormulaCellGroupRef xGroup; // re-factoring hack - group of formulae we're part of. sal_uInt16 nSeenInIteration; // Iteration cycle in which the cell was last encountered sal_uInt8 cMatrixFlag; // One of ScMatrixMode short nFormatType; @@ -146,6 +147,10 @@ public: const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, sal_uInt8 = MM_NONE ); + ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, const ScFormulaCellGroupRef& xGroup, + const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, + sal_uInt8 = MM_NONE ); + /** With formula string and grammar to compile with. formula::FormulaGrammar::GRAM_DEFAULT effectively isformula::FormulaGrammar::GRAM_NATIVE_UI that also includes formula::FormulaGrammar::CONV_UNSPECIFIED, therefor uses the address |