diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-06-13 22:15:31 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-06 09:12:18 -0500 |
| commit | 8ebcaeb22f6fe05750b50631dc67299b2f78e4e3 (patch) | |
| tree | 4746f4715e61b195d5b0b8758a0a4bca5058dfa3 /package | |
| parent | a9609b568ce74fa426d3322dd9270eba9c4d038a (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
(cherry picked from commit 4729774b244db7a175077ed0c70aa48be62bc60e)
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/xstor/ocompinstream.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index bcf502798b5d..00561849c887 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -63,18 +63,15 @@ OInputCompStream::OInputCompStream( uno::Reference < io::XInputStream > xStream, OInputCompStream::~OInputCompStream() { - { - ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - - if ( !m_bDisposed ) - { - m_refCount++; - dispose(); - } + ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - if ( m_pInterfaceContainer ) - delete m_pInterfaceContainer; + if ( !m_bDisposed ) + { + m_refCount++; + dispose(); } + + delete m_pInterfaceContainer; } uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) |