diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-06-07 17:02:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-06-07 21:34:06 +0300 |
| commit | 5b142483c14bbf78ba161b2e1bf3302dd4ed6d46 (patch) | |
| tree | 48e6df226662f0474571b4ccc8a63117abe4ebd0 /sc | |
| parent | 1d0d7127db27d12a39820023f25a212c05952610 (diff) | |
Take new FormulaTokenArrayPlainIterator into use in one more file
Change-Id: I2d68513664200349574446e68efcfacda1604f86
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 49c35f7ee6a6..f444ab05d5cf 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -120,6 +120,7 @@ using ::com::sun::star::chart2::data::XLabeledDataSequence; using ::com::sun::star::chart2::data::LabeledDataSequence; using ::formula::FormulaToken; +using ::formula::FormulaTokenArrayPlainIterator; using ::std::unique_ptr; namespace cssc = ::com::sun::star::chart; @@ -780,8 +781,8 @@ sal_uInt16 XclImpChSourceLink::GetCellCount() const sal_uInt32 nCellCount = 0; if( mxTokenArray ) { - mxTokenArray->Reset(); - for( const FormulaToken* pToken = mxTokenArray->First(); pToken; pToken = mxTokenArray->Next() ) + FormulaTokenArrayPlainIterator aIter(*mxTokenArray); + for( const FormulaToken* pToken = aIter.First(); pToken; pToken = aIter.Next() ) { switch( pToken->GetType() ) { @@ -895,8 +896,8 @@ void XclImpChSourceLink::FillSourceLink( ::std::vector< ScTokenRef >& rTokens ) // no links to fill. return; - mxTokenArray->Reset(); - for (FormulaToken* p = mxTokenArray->First(); p; p = mxTokenArray->Next()) + FormulaTokenArrayPlainIterator aIter(*mxTokenArray); + for (FormulaToken* p = aIter.First(); p; p = aIter.Next()) { ScTokenRef pToken(p->Clone()); if (ScRefTokenHelper::isRef(pToken)) |