diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-06-15 19:15:58 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-06-15 19:15:58 +0100 |
| commit | 57175968d152c94942f24fe82a4a1504631bbe41 (patch) | |
| tree | 4a64e5143b37cbc03e3c467c25b87cb147558b0a | |
| parent | e86780a78c7ef095bccff284a2b3dc490844babc (diff) | |
Overcome 'Reset' problems ...
Change-Id: I69f4e9f151f55879255903ee4d6d4b1fb075f836
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index c1776afa2939..f323a3b61668 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -4725,7 +4725,8 @@ bool ScCompiler::HandleRange() pNew = new ScTokenArray(); pNew->AddOpCode( ocClose ); PushTokenArray( pNew, true ); - pNew->Reset(); + maArrIterator.Reset(); +// pNew->Reset(); } pNew = pRangeData->GetCode()->Clone(); pNew->SetFromRangeName( true ); @@ -4743,13 +4744,15 @@ bool ScCompiler::HandleRange() SetRelNameReference(); MoveRelWrap(pRangeData->GetMaxCol(), pRangeData->GetMaxRow()); } - pNew->Reset(); + maArrIterator.Reset(); +// pNew->Reset(); if ( bAddPair ) { pNew = new ScTokenArray(); pNew->AddOpCode( ocOpen ); PushTokenArray( pNew, true ); - pNew->Reset(); + maArrIterator.Reset(); +// pNew->Reset(); } return GetToken(); } @@ -4761,7 +4764,8 @@ bool ScCompiler::HandleRange() pNew = new ScTokenArray; pNew->Add( new FormulaErrorToken( FormulaError::NoName)); PushTokenArray( pNew, true ); - pNew->Reset(); + maArrIterator.Reset(); +// pNew->Reset(); return GetToken(); } return true; @@ -4803,7 +4807,8 @@ bool ScCompiler::HandleExternalReference(const FormulaToken& _aToken) SetRelNameReference(); MoveRelWrap(MAXCOL, MAXROW); } - pNew->Reset(); +// pNew->Reset(); + maArrIterator.Reset(); return GetToken(); } default: @@ -5443,7 +5448,8 @@ bool ScCompiler::HandleColRowName() } } PushTokenArray( pNew, true ); - pNew->Reset(); +// pNew->Reset(); + maArrIterator.Reset(); return GetToken(); } } @@ -5468,7 +5474,8 @@ bool ScCompiler::HandleDbData() ScTokenArray* pNew = new ScTokenArray(); pNew->AddDoubleReference( aRefData ); PushTokenArray( pNew, true ); - pNew->Reset(); +// pNew->Reset(); + maArrIterator.Reset(); return GetToken(); } return true; @@ -5785,7 +5792,8 @@ bool ScCompiler::HandleTableRef() SetError( FormulaError::Pair); } PushTokenArray( pNew, true ); - pNew->Reset(); +// pNew->Reset(); + maArrIterator.Reset(); return GetToken(); } return true; |