summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2011-10-07 00:51:06 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2011-10-07 10:24:24 +0900
commit6b280c938d2213cf9e7ddea13baa38427c3b5c6d (patch)
tree031b46f134f080dd6dd6eceb81e5698f8b4a9ff4 /sc
parentfdo#41187 - "Prind grid" possible only when "Display grid" checked (diff)
downloadcore-6b280c938d2213cf9e7ddea13baa38427c3b5c6d.tar.gz
core-6b280c938d2213cf9e7ddea13baa38427c3b5c6d.zip
delete NULL is safe
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx13
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx14
2 files changed, 0 insertions, 27 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 51ac34190462..52e35dc239bb 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 3c61a1dfd5d6..f14b43e6d8d3 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;
}