summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-11 10:06:49 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-02-06 08:55:50 -0500
commitaaeead445c1c73de6f8f4c088ef87dd6fb24c661 (patch)
tree25339038b555394fd8b3e505803ce0f32a195f01 /vcl
parent7a58bd20dce4119507344e9a0c5a8aa44662045d (diff)
convert expressions like 'size() == 0' to 'empty()'
(cherry picked from commit 776a3f14f2d987312b926ebc1ad09321a3a87f0d) Change-Id: Ia5c8c0f38a347f398d587970a22e03f29ffd37af
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx8
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx2
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 9752e8677684..2fe3823ab0de 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -2136,7 +2136,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
}
else if( pFont->m_eType == fonttype::Type1 )
{
- if( ! pFont->m_aEncodingVector.size() )
+ if( pFont->m_aEncodingVector.empty() )
pFont->readAfmMetrics( m_pAtoms, true, true );
if( pFont->m_pMetrics )
{
@@ -2163,18 +2163,18 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font
if( !pFont || pFont->m_eType != fonttype::Type1 )
return NULL;
- if( ! pFont->m_aEncodingVector.size() )
+ if( pFont->m_aEncodingVector.empty() )
pFont->readAfmMetrics( m_pAtoms, true, true );
if( pNonEncoded )
- *pNonEncoded = pFont->m_aNonEncoded.size() ? &pFont->m_aNonEncoded : NULL;
+ *pNonEncoded = !pFont->m_aNonEncoded.empty() ? &pFont->m_aNonEncoded : NULL;
if (ppPriority)
{
*ppPriority = &pFont->m_aEncodingVectorPriority;
}
- return pFont->m_aEncodingVector.size() ? &pFont->m_aEncodingVector : NULL;
+ return !pFont->m_aEncodingVector.empty() ? &pFont->m_aEncodingVector : NULL;
}
std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 2a5112e6e819..ffe6417ac7ae 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1799,7 +1799,7 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue
char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
{
rBytes = 0;
- if( ! m_aCurrentValues.size() )
+ if( m_aCurrentValues.empty() )
return NULL;
hash_type::const_iterator it;
for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it )