delete NULL is safe

This commit is contained in:
Takeshi Abe 2011-10-07 00:51:06 +09:00
parent 11c4ce59cb
commit 6b280c938d
2 changed files with 0 additions and 27 deletions

View file

@ -540,31 +540,18 @@ ScXMLExport::ScXMLExport(
ScXMLExport::~ScXMLExport()
{
if (pGroupColumns)
delete pGroupColumns;
if (pGroupRows)
delete pGroupRows;
if (pColumnStyles)
delete pColumnStyles;
if (pRowStyles)
delete pRowStyles;
if (pCellStyles)
delete pCellStyles;
if (pRowFormatRanges)
delete pRowFormatRanges;
if (pMergedRangesContainer)
delete pMergedRangesContainer;
if (pValidationsContainer)
delete pValidationsContainer;
if (pChangeTrackingExportHelper)
delete pChangeTrackingExportHelper;
if (pChartListener)
delete pChartListener;
if (pCellsItr)
delete pCellsItr;
if (pDefaults)
delete pDefaults;
if (pNumberFormatAttributesExportHelper)
delete pNumberFormatAttributesExportHelper;
}

View file

@ -1674,9 +1674,6 @@ ScXMLImport::ScXMLImport(
sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)),
sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)),
sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)),
// pScAutoStylePool(new SvXMLAutoStylePoolP),
// pParaItemMapper( 0 ),
// pI18NMap( new SvI18NMap ),
pDocElemTokenMap( 0 ),
pStylesElemTokenMap( 0 ),
pStylesAttrTokenMap( 0 ),
@ -1869,27 +1866,16 @@ ScXMLImport::~ScXMLImport() throw()
delete pDataPilotMemberAttrTokenMap;
delete pConsolidationAttrTokenMap;
// if (pScAutoStylePool)
// delete pScAutoStylePool;
if (pChangeTrackingImportHelper)
delete pChangeTrackingImportHelper;
if (pNumberFormatAttributesExportHelper)
delete pNumberFormatAttributesExportHelper;
if (pStyleNumberFormats)
delete pStyleNumberFormats;
if (pStylesImportHelper)
delete pStylesImportHelper;
if (pSolarMutexGuard)
delete pSolarMutexGuard;
if (pMyNamedExpressions)
delete pMyNamedExpressions;
if (pMyLabelRanges)
delete pMyLabelRanges;
if (pValidations)
delete pValidations;
if (pDetectiveOpArray)
delete pDetectiveOpArray;
}