diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-06-13 22:15:31 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-06-15 14:46:41 +0200 |
commit | 4729774b244db7a175077ed0c70aa48be62bc60e (patch) | |
tree | 9f0f2e329d269835d4c20a8183a2772b734608f3 /dbaccess | |
parent | 9db80b1499e09cde000160434728f7b231c30db8 (diff) |
remove unnecessary check for null when calling delete
Idea originally from caolan.
Found using the following command:
find . -name *.cxx | xargs /opt/local/bin/grep -zlP '(?m)if\s*\(\s*\w+\s*\)\s*delete\s+\w+\;'
Change-Id: I3338f4e22193a6dfd6219c8c75835224a3392763
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/api/RowSetBase.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/core/api/TableDeco.cxx | 3 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/intercept.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/moduledbu.cxx | 4 |
4 files changed, 5 insertions, 14 deletions
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 547c2c113090..ebdd4a81f073 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -113,9 +113,7 @@ ORowSetBase::~ORowSetBase() m_pColumns = NULL; } - if ( m_pEmptyCollection ) - delete m_pEmptyCollection; - + delete m_pEmptyCollection; } // com::sun::star::lang::XTypeProvider diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 0c21188c477d..bdd7740a855f 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -75,8 +75,7 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect ODBTableDecorator::~ODBTableDecorator() { - if ( m_pColumns ) - delete m_pColumns; + delete m_pColumns; } Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeException, std::exception) diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index d6c05953941f..7059c2290b0f 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -96,12 +96,8 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder ) OInterceptor::~OInterceptor() { - if( m_pDisposeEventListeners ) - delete m_pDisposeEventListeners; - - if(m_pStatCL) - delete m_pStatCL; - + delete m_pDisposeEventListeners; + delete m_pStatCL; } struct DispatchHelper diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 63502fbf7bd2..702b14e0ac65 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -54,9 +54,7 @@ OModuleImpl::OModuleImpl() OModuleImpl::~OModuleImpl() { - if (m_pResources) - delete m_pResources; - + delete m_pResources; } ResMgr* OModuleImpl::getResManager() |