diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-06-07 16:47:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-06-07 21:34:05 +0300 |
| commit | 91a35c6a994a03ef5f0262a781740709a3d8e30a (patch) | |
| tree | 656274ea191f0510e832bace66a3eecfbf04a37b /sc/source/core/tool/rangenam.cxx | |
| parent | 74b1a89902980aaacc1c72ba42e3d945ead99bcf (diff) | |
Take new FormulaTokenArrayPlainIterator into use in one more file
Change-Id: I5dfae10ec9df7e5b450c9a105ecc76c5d36970c3
Diffstat (limited to 'sc/source/core/tool/rangenam.cxx')
| -rw-r--r-- | sc/source/core/tool/rangenam.cxx | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index f2aff8454dce..cbf3ff621495 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -163,8 +163,8 @@ void ScRangeData::CompileRangeData( const OUString& rSymbol, bool bSetError ) pCode->SetFromRangeName(true); if( pCode->GetCodeError() == FormulaError::NONE ) { - pCode->Reset(); - FormulaToken* p = pCode->GetNextReference(); + FormulaTokenArrayPlainIterator aIter(*pCode); + FormulaToken* p = aIter.GetNextReference(); if( p ) { // first token is a reference @@ -222,8 +222,8 @@ void ScRangeData::GuessPosition() SCTAB nMinTab = 0; formula::FormulaToken* t; - pCode->Reset(); - while ( ( t = pCode->GetNextReference() ) != nullptr ) + formula::FormulaTokenArrayPlainIterator aIter(*pCode); + while ( ( t = aIter.GetNextReference() ) != nullptr ) { ScSingleRefData& rRef1 = *t->GetSingleRef(); if ( rRef1.IsColRel() && rRef1.Col() < nMinCol ) @@ -283,9 +283,9 @@ void ScRangeData::UpdateTranspose( const ScRange& rSource, const ScAddress& rDes bool bChanged = false; formula::FormulaToken* t; - pCode->Reset(); + formula::FormulaTokenArrayPlainIterator aIter(*pCode); - while ( ( t = pCode->GetNextReference() ) != nullptr ) + while ( ( t = aIter.GetNextReference() ) != nullptr ) { if( t->GetType() != svIndex ) { @@ -315,9 +315,9 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) bool bChanged = false; formula::FormulaToken* t; - pCode->Reset(); + formula::FormulaTokenArrayPlainIterator aIter(*pCode); - while ( ( t = pCode->GetNextReference() ) != nullptr ) + while ( ( t = aIter.GetNextReference() ) != nullptr ) { if( t->GetType() != svIndex ) { @@ -544,8 +544,8 @@ void ScRangeData::ValidateTabRefs() SCTAB nMinTab = aPos.Tab(); SCTAB nMaxTab = nMinTab; formula::FormulaToken* t; - pCode->Reset(); - while ( ( t = pCode->GetNextReference() ) != nullptr ) + formula::FormulaTokenArrayPlainIterator aIter(*pCode); + while ( ( t = aIter.GetNextReference() ) != nullptr ) { ScSingleRefData& rRef1 = *t->GetSingleRef(); ScAddress aAbs = rRef1.toAbs(aPos); @@ -580,8 +580,8 @@ void ScRangeData::ValidateTabRefs() ScAddress aOldPos = aPos; aPos.SetTab( aPos.Tab() - nMove ); - pCode->Reset(); - while ( ( t = pCode->GetNextReference() ) != nullptr ) + aIter.Reset(); + while ( ( t = aIter.GetNextReference() ) != nullptr ) { switch (t->GetType()) { @@ -628,8 +628,7 @@ void ScRangeData::InitCode() { if( pCode->GetCodeError() == FormulaError::NONE ) { - pCode->Reset(); - FormulaToken* p = pCode->GetNextReference(); + FormulaToken* p = FormulaTokenArrayPlainIterator(*pCode).GetNextReference(); if( p ) // exact one reference at first { if( p->GetType() == svSingleRef ) |