diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-03-24 20:50:41 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-03-25 10:54:05 +0900 |
| commit | c7af37db60aab361e8ab01e69c816d249fb558b6 (patch) | |
| tree | 4cbda4ef41484941db704d9d022aec4a3cdc11b8 /vcl | |
| parent | fad530fa03cda8a1cd1490bc579fe6bc71638920 (diff) | |
deleting NULL is safe
Change-Id: I3748d0034b2c8e9d9122ad2a9001763eb1265e1d
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 59c21c38d6f0..c5a52f71afce 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -187,8 +187,7 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) : PrintFontManager::PrintFont::~PrintFont() { - if( m_pMetrics ) - delete m_pMetrics; + delete m_pMetrics; } // ------------------------------------------------------------------------- @@ -749,8 +748,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, m_nLeading = m_nAscend + m_nDescend - 1000; - if( m_pMetrics ) - delete m_pMetrics; + delete m_pMetrics; m_pMetrics = new PrintFontMetrics; // mark all pages as queried (or clear if only global font info queiried) memset( m_pMetrics->m_aPages, bOnlyGlobalAttributes ? 0 : 0xff, sizeof( m_pMetrics->m_aPages ) ); @@ -1014,8 +1012,7 @@ PrintFontManager::~PrintFontManager() for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it ) delete (*it).second; delete m_pAtoms; - if( m_pFontCache ) - delete m_pFontCache; + delete m_pFontCache; } // ------------------------------------------------------------------------- |