From 4729774b244db7a175077ed0c70aa48be62bc60e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 13 Jun 2015 22:15:31 +0200 Subject: 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 --- xmloff/source/chart/SchXMLImport.cxx | 34 ++++++++++++---------------------- xmloff/source/draw/sdxmlimp.cxx | 30 ++++++++++-------------------- xmloff/source/draw/shapeimport.cxx | 24 ++++++++++++------------ xmloff/source/draw/ximpshap.cxx | 3 +-- xmloff/source/style/MarkerStyle.cxx | 3 +-- 5 files changed, 36 insertions(+), 58 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 3cd2dc09823d..46083c41febd 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -104,28 +104,18 @@ SchXMLImportHelper::SchXMLImportHelper() : SchXMLImportHelper::~SchXMLImportHelper() { - // delete token maps - if( mpChartDocElemTokenMap ) - delete mpChartDocElemTokenMap; - if( mpTableElemTokenMap ) - delete mpTableElemTokenMap; - if( mpChartElemTokenMap ) - delete mpChartElemTokenMap; - if( mpPlotAreaElemTokenMap ) - delete mpPlotAreaElemTokenMap; - if( mpSeriesElemTokenMap ) - delete mpSeriesElemTokenMap; - - if( mpChartAttrTokenMap ) - delete mpChartAttrTokenMap; - if( mpPlotAreaAttrTokenMap ) - delete mpPlotAreaAttrTokenMap; - if( mpAutoStyleAttrTokenMap ) - delete mpAutoStyleAttrTokenMap; - if( mpCellAttrTokenMap ) - delete mpCellAttrTokenMap; - if( mpSeriesAttrTokenMap ) - delete mpSeriesAttrTokenMap; + // delete token maps + delete mpChartDocElemTokenMap; + delete mpTableElemTokenMap; + delete mpChartElemTokenMap; + delete mpPlotAreaElemTokenMap; + delete mpSeriesElemTokenMap; + + delete mpChartAttrTokenMap; + delete mpPlotAreaAttrTokenMap; + delete mpAutoStyleAttrTokenMap; + delete mpCellAttrTokenMap; + delete mpSeriesAttrTokenMap; delete mpPropMappingAttrTokenMap; } diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index f7df18e0938c..b38d117ca590 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -421,26 +421,16 @@ SdXMLImport::~SdXMLImport() throw () mpMasterStylesContext->ReleaseRef(); // delete all token maps - if(mpDocElemTokenMap) - delete mpDocElemTokenMap; - if(mpBodyElemTokenMap) - delete mpBodyElemTokenMap; - if(mpStylesElemTokenMap) - delete mpStylesElemTokenMap; - if(mpMasterPageElemTokenMap) - delete mpMasterPageElemTokenMap; - if(mpMasterPageAttrTokenMap) - delete mpMasterPageAttrTokenMap; - if(mpPageMasterAttrTokenMap) - delete mpPageMasterAttrTokenMap; - if(mpPageMasterStyleAttrTokenMap) - delete mpPageMasterStyleAttrTokenMap; - if(mpDrawPageAttrTokenMap) - delete mpDrawPageAttrTokenMap; - if(mpDrawPageElemTokenMap) - delete mpDrawPageElemTokenMap; - if(mpPresentationPlaceholderAttrTokenMap) - delete mpPresentationPlaceholderAttrTokenMap; + delete mpDocElemTokenMap; + delete mpBodyElemTokenMap; + delete mpStylesElemTokenMap; + delete mpMasterPageElemTokenMap; + delete mpMasterPageAttrTokenMap; + delete mpPageMasterAttrTokenMap; + delete mpPageMasterStyleAttrTokenMap; + delete mpDrawPageAttrTokenMap; + delete mpDrawPageElemTokenMap; + delete mpPresentationPlaceholderAttrTokenMap; } const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap() diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index c8dc20cade86..d86ee5094c3a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -200,18 +200,18 @@ XMLShapeImportHelper::~XMLShapeImportHelper() mpPresPagePropsMapper = 0L; } - if(mpGroupShapeElemTokenMap) delete mpGroupShapeElemTokenMap; - if(mpFrameShapeElemTokenMap) delete mpFrameShapeElemTokenMap; - - if(mpPolygonShapeAttrTokenMap) delete mpPolygonShapeAttrTokenMap; - if(mpPathShapeAttrTokenMap) delete mpPathShapeAttrTokenMap; - if(mp3DSceneShapeElemTokenMap) delete mp3DSceneShapeElemTokenMap; - if(mp3DObjectAttrTokenMap) delete mp3DObjectAttrTokenMap; - if(mp3DPolygonBasedAttrTokenMap) delete mp3DPolygonBasedAttrTokenMap; - if(mp3DCubeObjectAttrTokenMap) delete mp3DCubeObjectAttrTokenMap; - if(mp3DSphereObjectAttrTokenMap) delete mp3DSphereObjectAttrTokenMap; - if(mp3DSceneShapeAttrTokenMap) delete mp3DSceneShapeAttrTokenMap; - if(mp3DLightAttrTokenMap) delete mp3DLightAttrTokenMap; + delete mpGroupShapeElemTokenMap; + delete mpFrameShapeElemTokenMap; + + delete mpPolygonShapeAttrTokenMap; + delete mpPathShapeAttrTokenMap; + delete mp3DSceneShapeElemTokenMap; + delete mp3DObjectAttrTokenMap; + delete mp3DPolygonBasedAttrTokenMap; + delete mp3DCubeObjectAttrTokenMap; + delete mp3DSphereObjectAttrTokenMap; + delete mp3DSceneShapeAttrTokenMap; + delete mp3DLightAttrTokenMap; // Styles or AutoStyles context? if(mpStylesContext) diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 316b37912a00..fac5f3bcdeba 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2574,8 +2574,7 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( SdXMLChartShapeContext::~SdXMLChartShapeContext() { - if( mpChartContext ) - delete mpChartContext; + delete mpChartContext; } void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index a2c138689009..864eedf889a8 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -136,8 +136,7 @@ bool XMLMarkerStyleImport::importXML( } } - if( pViewBox ) - delete pViewBox; + delete pViewBox; return bHasViewBox && bHasPathData; } -- cgit