sc/source/filter/xml/xmlexprt.cxx | 13 ------------- sc/source/filter/xml/xmlimprt.cxx | 14 -------------- 2 files changed, 27 deletions(-)
New commits: commit 6b280c938d2213cf9e7ddea13baa38427c3b5c6d Author: Takeshi Abe <t...@fixedpoint.jp> Date: Fri Oct 7 00:51:06 2011 +0900 delete NULL is safe diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 51ac341..52e35dc 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -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; } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 3c61a1d..f14b43e 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -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; } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits