diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-01 10:18:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-01 11:05:21 +0200 |
| commit | 74a944721c093e6a781d2bfa90b1ddeb11462b73 (patch) | |
| tree | 663ed6b90bbd7d98bb4fd7128aed51028aedfdb7 /vcl/unx | |
| parent | 3c376151f5445f3a5ca147f962a12235128cfc01 (diff) | |
std::list<int> to vector
Change-Id: I05d4531ac6d3daa8c996db374bc2a2425215dde8
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontcache.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx index 27851c19f563..e308db8018b7 100644 --- a/vcl/unx/generic/fontmanager/fontcache.cxx +++ b/vcl/unx/generic/fontmanager/fontcache.cxx @@ -153,9 +153,9 @@ void FontCache::flush() nSubEntry = 0; aLine.append(OUStringToOString(pAtoms->getString( ATOM_FAMILYNAME, (*it)->m_nFamilyName), RTL_TEXTENCODING_UTF8)); - for( ::std::list< int >::const_iterator name_it = (*it)->m_aAliases.begin(); name_it != (*it)->m_aAliases.end(); ++name_it ) + for( int name : (*it)->m_aAliases ) { - const OUString& rAdd( pAtoms->getString( ATOM_FAMILYNAME, *name_it ) ); + const OUString& rAdd( pAtoms->getString( ATOM_FAMILYNAME, name ) ); if( !rAdd.isEmpty() ) { aLine.append(';'); @@ -567,7 +567,7 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print pRight->m_bUserOverride != pLeft->m_bUserOverride ) return false; - std::list< int >::const_iterator lit, rit; + std::vector< int >::const_iterator lit, rit; for( lit = pLeft->m_aAliases.begin(), rit = pRight->m_aAliases.begin(); lit != pLeft->m_aAliases.end() && rit != pRight->m_aAliases.end() && (*lit) == (*rit); ++lit, ++rit ) diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index e7e59aa80b41..a53278769be1 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -1234,9 +1234,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it ); if( nAlias != pFont->m_nFamilyName ) { - std::list< int >::const_iterator al_it; - for( al_it = pFont->m_aAliases.begin(); al_it != pFont->m_aAliases.end() && *al_it != nAlias; ++al_it ) - ; + std::vector< int >::const_iterator al_it = + std::find( pFont->m_aAliases.begin(), pFont->m_aAliases.end(), nAlias ); if( al_it == pFont->m_aAliases.end() ) pFont->m_aAliases.push_back( nAlias ); } @@ -1539,8 +1538,8 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r rInfo.m_bSubsettable = (pFont->m_eType == fonttype::TrueType); // TODO: rename to SfntType rInfo.m_aAliases.clear(); - for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it ) - rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) ); + for( int i : pFont->m_aAliases ) + rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, i ) ); } void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const |