Kaydet (Commit) 37a8815c authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Let's not use 'p' prefix for iterators.

'p' is reserved for pointers, and iterators are not pointers.
üst d905f614
...@@ -566,12 +566,12 @@ sal_Bool RangeNameBufferWK3::FindRel( const String& rRef, sal_uInt16& rIndex ) ...@@ -566,12 +566,12 @@ sal_Bool RangeNameBufferWK3::FindRel( const String& rRef, sal_uInt16& rIndex )
{ {
StringHashEntry aRef( rRef ); StringHashEntry aRef( rRef );
std::vector<ENTRY>::const_iterator pIter; std::vector<ENTRY>::const_iterator itr;
for ( pIter = maEntries.begin(); pIter != maEntries.end(); ++pIter ) for ( itr = maEntries.begin(); itr != maEntries.end(); ++itr )
{ {
if ( aRef == pIter->aStrHashEntry ) if ( aRef == itr->aStrHashEntry )
{ {
rIndex = pIter->nRelInd; rIndex = itr->nRelInd;
return true; return true;
} }
} }
...@@ -585,37 +585,37 @@ sal_Bool RangeNameBufferWK3::FindAbs( const String& rRef, sal_uInt16& rIndex ) ...@@ -585,37 +585,37 @@ sal_Bool RangeNameBufferWK3::FindAbs( const String& rRef, sal_uInt16& rIndex )
String aTmp( rRef ); String aTmp( rRef );
StringHashEntry aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen! StringHashEntry aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen!
std::vector<ENTRY>::iterator pIter; std::vector<ENTRY>::iterator itr;
for ( pIter = maEntries.begin(); pIter != maEntries.end(); ++pIter ) for ( itr = maEntries.begin(); itr != maEntries.end(); ++itr )
{ {
if ( aRef == pIter->aStrHashEntry ) if ( aRef == itr->aStrHashEntry )
{ {
// eventuell neuen Range Name aufbauen // eventuell neuen Range Name aufbauen
if( pIter->nAbsInd ) if( itr->nAbsInd )
rIndex = pIter->nAbsInd; rIndex = itr->nAbsInd;
else else
{ {
ScSingleRefData* pRef = &pIter->aScComplexRefDataRel.Ref1; ScSingleRefData* pRef = &itr->aScComplexRefDataRel.Ref1;
pScTokenArray->Clear(); pScTokenArray->Clear();
pRef->SetColRel( false ); pRef->SetColRel( false );
pRef->SetRowRel( false ); pRef->SetRowRel( false );
pRef->SetTabRel( sal_True ); pRef->SetTabRel( sal_True );
if( pIter->bSingleRef ) if( itr->bSingleRef )
pScTokenArray->AddSingleReference( *pRef ); pScTokenArray->AddSingleReference( *pRef );
else else
{ {
pRef = &pIter->aScComplexRefDataRel.Ref2; pRef = &itr->aScComplexRefDataRel.Ref2;
pRef->SetColRel( false ); pRef->SetColRel( false );
pRef->SetRowRel( false ); pRef->SetRowRel( false );
pRef->SetTabRel( sal_True ); pRef->SetTabRel( sal_True );
pScTokenArray->AddDoubleReference( pIter->aScComplexRefDataRel ); pScTokenArray->AddDoubleReference( itr->aScComplexRefDataRel );
} }
ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, pIter->aScAbsName, *pScTokenArray ); ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, itr->aScAbsName, *pScTokenArray );
rIndex = pIter->nAbsInd = nIntCount; rIndex = itr->nAbsInd = nIntCount;
pData->SetIndex( rIndex ); pData->SetIndex( rIndex );
nIntCount++; nIntCount++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment