summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-06-13 22:15:31 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-02-06 09:12:18 -0500
commit8ebcaeb22f6fe05750b50631dc67299b2f78e4e3 (patch)
tree4746f4715e61b195d5b0b8758a0a4bca5058dfa3 /sfx2/source
parenta9609b568ce74fa426d3322dd9270eba9c4d038a (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 'sfx2/source')
-rw-r--r--sfx2/source/appl/impldde.cxx3
-rw-r--r--sfx2/source/appl/xpackcreator.cxx9
-rw-r--r--sfx2/source/doc/guisaveas.cxx7
3 files changed, 6 insertions, 13 deletions
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 4eb4e65cd373..12bd1ccacb52 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -181,8 +181,7 @@ bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
{
// otherwise it will be executed asynchronously
{
- if( pRequest )
- delete pRequest;
+ delete pRequest;
pRequest = new DdeRequest( *pConnection, sItem );
pRequest->SetDataHdl( LINK( this, SvDDEObject, ImplGetDDEData ) );
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index f447273a90ed..380b3ba02c93 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -117,8 +117,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
}
catch (const uno::RuntimeException&)
{
- if ( pTempStream )
- delete pTempStream;
+ delete pTempStream;
if ( !aTempURL.isEmpty() )
::utl::UCBContentHelper::Kill( aTempURL );
@@ -127,8 +126,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
}
catch (const io::IOException&)
{
- if ( pTempStream )
- delete pTempStream;
+ delete pTempStream;
if ( !aTempURL.isEmpty() )
::utl::UCBContentHelper::Kill( aTempURL );
@@ -139,8 +137,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde
{
}
- if ( pTempStream )
- delete pTempStream;
+ delete pTempStream;
if ( !aTempURL.isEmpty() )
::utl::UCBContentHelper::Kill( aTempURL );
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index fc0228f86671..9010793f60be 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -370,11 +370,8 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner,
ModelData_Impl::~ModelData_Impl()
{
FreeDocumentProps();
- if ( m_pDocumentPropsHM )
- delete m_pDocumentPropsHM;
-
- if ( m_pModulePropsHM )
- delete m_pModulePropsHM;
+ delete m_pDocumentPropsHM;
+ delete m_pModulePropsHM;
}