Kaydet (Commit) 2aabf102 authored tarafından Julien Nabet's avatar Julien Nabet

Use const_iterator when possible (svx/customshapes)

Change-Id: Ieb7b3d2eb8cc2626b21508fed3c6c3f01076c792
Reviewed-on: https://gerrit.libreoffice.org/24025Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst f2fd2019
...@@ -725,7 +725,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con ...@@ -725,7 +725,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
// removing placeholder objects // removing placeholder objects
std::vector< E3dCompoundObject* >::iterator aObjectListIter( aPlaceholderObjectList.begin() ); std::vector< E3dCompoundObject* >::iterator aObjectListIter( aPlaceholderObjectList.begin() );
while ( aObjectListIter != aPlaceholderObjectList.end() ) std::vector< E3dCompoundObject* >::const_iterator aEnd( aPlaceholderObjectList.end() );
while ( aObjectListIter != aEnd )
{ {
pScene->Remove3DObj( *aObjectListIter ); pScene->Remove3DObj( *aObjectListIter );
delete *aObjectListIter++; delete *aObjectListIter++;
......
...@@ -293,7 +293,7 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString& rShapeType ) ...@@ -293,7 +293,7 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString& rShapeType )
for ( i = 0; i < nLen; i++ ) for ( i = 0; i < nLen; i++ )
pBuf[ i ] = (char)rShapeType[ i ]; pBuf[ i ] = (char)rShapeType[ i ];
pBuf[ i ] = 0; pBuf[ i ] = 0;
TypeNameHashMap::iterator aHashIter( pHashMap->find( pBuf.get() ) ); TypeNameHashMap::const_iterator aHashIter( pHashMap->find( pBuf.get() ) );
if ( aHashIter != pHashMap->end() ) if ( aHashIter != pHashMap->end() )
eRetValue = (*aHashIter).second; eRetValue = (*aHashIter).second;
return eRetValue; return eRetValue;
...@@ -548,7 +548,7 @@ OUString EnhancedCustomShapeTypeNames::GetAccName( const OUString& rShapeType ) ...@@ -548,7 +548,7 @@ OUString EnhancedCustomShapeTypeNames::GetAccName( const OUString& rShapeType )
for ( i = 0; i < nLen; i++ ) for ( i = 0; i < nLen; i++ )
pBuf[ i ] = (char)rShapeType[ i ]; pBuf[ i ] = (char)rShapeType[ i ];
pBuf[ i ] = 0; pBuf[ i ] = 0;
TypeACCNameHashMap::iterator aHashIter( pACCHashMap->find( pBuf.get() ) ); TypeACCNameHashMap::const_iterator aHashIter( pACCHashMap->find( pBuf.get() ) );
if ( aHashIter != pACCHashMap->end() ) if ( aHashIter != pACCHashMap->end() )
sRetValue = OUString::createFromAscii( (*aHashIter).second ); sRetValue = OUString::createFromAscii( (*aHashIter).second );
return sRetValue; return sRetValue;
......
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