diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 09:48:44 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:01:42 +0100 |
| commit | bef01b6751dc826beff29426ad6ac3c3a5f9dbcc (patch) | |
| tree | ee8414c8bf833f7b98da20fb0c177d389e080781 /sc/source/core/inc | |
| parent | c4712cc4f3f8cf5e68d8d6b717e6f1f4a9b445f0 (diff) | |
| parent | c76ef5619cebf8ebd31db94d15a0861905783a4e (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
additionally the following iz patches are rolled up with this commit i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 i#112530
Diffstat (limited to 'sc/source/core/inc')
| -rw-r--r-- | sc/source/core/inc/interpre.hxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 98c6afbe4..138d1bec9 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -135,6 +135,15 @@ public: static inline double div( const double& fNumerator, const double& fDenominator ); ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR); + + enum VolatileType { + VOLATILE, + VOLATILE_MACRO, + NOT_VOLATILE + }; + + VolatileType GetVolatileType() const; + private: static ScTokenStack* pGlobalStack; static BOOL bGlobalStackInUse; @@ -169,6 +178,8 @@ private: BOOL bCalcAsShown; // precision as shown BOOL bMatrixFormula; // formula cell is a matrix formula + VolatileType meVolaileType; + //---------------------------------Funktionen in interpre.cxx--------- // nMust <= nAct <= nMax ? ok : PushError inline BOOL MustHaveParamCount( short nAct, short nMust ); |