diff options
| author | Eike Rathke <erack@redhat.com> | 2016-08-25 12:38:13 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-08-25 15:51:52 +0200 |
| commit | 035fc620b833a853a5ef84a7a05298be8d91a24c (patch) | |
| tree | 3b92a1f93fbbd415eeee7015955fd25c32a25f34 /sc | |
| parent | 28da3aed71a4850f47156d717b6a18fce98154e9 (diff) | |
move the nCurFmtType=UNDEFINED from PushWithoutError()
... to the only place where it makes sense.
Change-Id: I8a2927af97abee28dd0ec89793c4745dcbd0031f
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index c6e3f209b338..64b151d2ea9c 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -628,7 +628,6 @@ void ScInterpreter::PushWithoutError( const FormulaToken& r ) SetError( errStackOverflow ); else { - nCurFmtType = css::util::NumberFormat::UNDEFINED; r.IncRef(); if( sp >= maxsp ) maxsp = sp + 1; @@ -3885,6 +3884,7 @@ StackVar ScInterpreter::Interpret() { // RPN code push without error PushWithoutError( *pCur ); + nCurFmtType = css::util::NumberFormat::UNDEFINED; } else if (pTokenMatrixMap && !(eOp == ocIf || eOp == ocIfError || eOp == ocIfNA || eOp == ocChoose) && |