diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-10 13:51:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-06-11 06:48:29 +0000 |
| commit | d203948fdb780c7af5777fcc26ad88bac1bd714e (patch) | |
| tree | 95458f3a290eed3d9a4ca13f28ec63f50490d7a6 /vcl/generic/fontmanager | |
| parent | 754ade38ddb2e96187d00f3e621203cea34961fa (diff) | |
convert 'it.begin() == it.end()' to 'it.empty()'
Change-Id: I244a9eb6bce6b1c649653ec38ebb9a39f8b4c145
Reviewed-on: https://gerrit.libreoffice.org/16212
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/generic/fontmanager')
| -rw-r--r-- | vcl/generic/fontmanager/fontcache.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 7448570c8ada..f7735d1e4264 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -125,7 +125,7 @@ void FontCache::flush() { // insert cache entries const FontCacheEntry& rEntry( entry_it->second.m_aEntry ); - if( rEntry.begin() == rEntry.end() ) + if( rEntry.empty() ) continue; aLine.append("File:"); diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 2f4b49a09f3e..9752e8677684 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -1208,7 +1208,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const // set family name from XLFD if possible if( ! pFont->m_nFamilyName ) { - if( aNames.begin() != aNames.end() ) + if( !aNames.empty() ) { pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front(), true ); aNames.pop_front(); @@ -2187,7 +2187,7 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha for( ; range.first != range.second; ++range.first ) aRet.push_back( range.first->second ); - if( aRet.begin() == aRet.end() && aChar != 0 ) + if( aRet.empty() && aChar != 0 ) { sal_Char aBuf[8]; sal_Int32 nChars = snprintf( aBuf, sizeof( aBuf ), "uni%.4hX", aChar ); @@ -2207,7 +2207,7 @@ std::list< sal_Unicode > PrintFontManager::getUnicodeFromAdobeName( const OStri for( ; range.first != range.second; ++range.first ) aRet.push_back( range.first->second ); - if( aRet.begin() == aRet.end() ) + if( aRet.empty() ) { if( rName.getLength() == 7 && rName.startsWith( "uni" ) ) { |