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 /embedserv | |
| 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 'embedserv')
| -rw-r--r-- | embedserv/source/embed/intercept.cxx | 7 | ||||
| -rw-r--r-- | embedserv/source/inprocserv/advisesink.cxx | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index 2593c3e94c0e..20dcfd116511 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -112,11 +112,8 @@ Interceptor::Interceptor( Interceptor::~Interceptor() { - if( m_pDisposeEventListeners ) - delete m_pDisposeEventListeners; - - if(m_pStatCL) - delete m_pStatCL; + delete m_pDisposeEventListeners; + delete m_pStatCL; DocumentHolder* pTmpDocH = NULL; uno::Reference< uno::XInterface > xLock; diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx index 6d44b9f3caf2..eb6488c91c58 100644 --- a/embedserv/source/inprocserv/advisesink.cxx +++ b/embedserv/source/inprocserv/advisesink.cxx @@ -92,8 +92,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList OleWrapperAdviseSink::~OleWrapperAdviseSink() { - if ( m_pFormatEtc ) - delete m_pFormatEtc; + delete m_pFormatEtc; } STDMETHODIMP OleWrapperAdviseSink::QueryInterface( REFIID riid , void** ppv ) |