diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/recursionhelper.hxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/recursionhelper.hxx')
| -rw-r--r-- | sc/inc/recursionhelper.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx index 7881addf248f..dc44921d8840 100644 --- a/sc/inc/recursionhelper.hxx +++ b/sc/inc/recursionhelper.hxx @@ -40,9 +40,9 @@ class ScFormulaCell; struct ScFormulaRecursionEntry { ScFormulaCell* pCell; - BOOL bOldRunning; + sal_Bool bOldRunning; ScFormulaResult aPreviousResult; - ScFormulaRecursionEntry( ScFormulaCell* p, BOOL bR, + ScFormulaRecursionEntry( ScFormulaCell* p, sal_Bool bR, const ScFormulaResult & rRes ) : pCell(p), bOldRunning(bR), aPreviousResult( rRes) { @@ -58,8 +58,8 @@ class ScRecursionHelper ScFormulaRecursionList::iterator aInsertPos; ScFormulaRecursionList::iterator aLastIterationStart; ScRecursionInIterationStack aRecursionInIterationStack; - USHORT nRecursionCount; - USHORT nIteration; + sal_uInt16 nRecursionCount; + sal_uInt16 nIteration; bool bInRecursionReturn; bool bDoingRecursion; bool bInIterationReturn; @@ -82,7 +82,7 @@ class ScRecursionHelper public: ScRecursionHelper() { Init(); } - USHORT GetRecursionCount() const { return nRecursionCount; } + sal_uInt16 GetRecursionCount() const { return nRecursionCount; } void IncRecursionCount() { ++nRecursionCount; } void DecRecursionCount() { --nRecursionCount; } /// A pure recursion return, no iteration. @@ -97,7 +97,7 @@ class ScRecursionHelper } bool IsDoingRecursion() const { return bDoingRecursion; } void SetDoingRecursion( bool b ) { bDoingRecursion = b; } - void Insert( ScFormulaCell* p, BOOL bOldRunning, + void Insert( ScFormulaCell* p, sal_Bool bOldRunning, const ScFormulaResult & rRes ) { aRecursionFormulas.insert( aInsertPos, ScFormulaRecursionEntry( p, @@ -119,7 +119,7 @@ class ScRecursionHelper bInIterationReturn = b; } bool IsDoingIteration() const { return nIteration > 0; } - USHORT GetIteration() const { return nIteration; } + sal_uInt16 GetIteration() const { return nIteration; } bool & GetConvergingReference() { return bConverging; } void StartIteration() { |