diff options
| -rw-r--r-- | idlc/source/astunion.cxx | 6 | ||||
| -rw-r--r-- | svx/source/items/numinf.cxx | 3 | ||||
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 9 |
3 files changed, 6 insertions, 12 deletions
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx index 827dbbda61eb..8a03ae5d9d4a 100644 --- a/idlc/source/astunion.cxx +++ b/idlc/source/astunion.cxx @@ -362,8 +362,7 @@ AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, con AstUnionBranch::~AstUnionBranch() { - if ( m_pLabel ) - delete m_pLabel; + delete m_pLabel; } AstUnionLabel::AstUnionLabel(UnionLabel labelKind, AstExpression* pExpr) @@ -376,8 +375,7 @@ AstUnionLabel::AstUnionLabel(UnionLabel labelKind, AstExpression* pExpr) AstUnionLabel::~AstUnionLabel() { - if ( m_pLabelValue ) - delete m_pLabelValue; + delete m_pLabelValue; } diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 8583b69077d9..34ab3ea9b249 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -112,8 +112,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : SvxNumberInfoItem::~SvxNumberInfoItem() { - if ( pDelFormatArr ) - delete []pDelFormatArr; + delete [] pDelFormatArr; } //------------------------------------------------------------------------ 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; } // ------------------------------------------------------------------------- |