diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-24 22:58:48 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-08-28 15:31:43 +0200 |
| commit | fd1fad4f4228630fa244820e5f0314c5835c5333 (patch) | |
| tree | d97df9edf40aeb0be38fba5277580f977fb012fe | |
| parent | 06784203728ae5c03edd2a5e311fae532c3e7a12 (diff) | |
remove some more null pointer checks before delete
Change-Id: I5997f0440a8a4875e800e830df211e8108752b37
| -rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.cxx | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 438ac0e5a607..c40ba95a131f 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -264,22 +264,16 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) ScMyStylesImportHelper::~ScMyStylesImportHelper() { - if (pPrevStyleName) - delete pPrevStyleName; - if (pPrevCurrency) - delete pPrevCurrency; - if (pStyleName) - delete pStyleName; - if (pCurrency) - delete pCurrency; + delete pPrevStyleName; + delete pPrevCurrency; + delete pStyleName; + delete pCurrency; } void ScMyStylesImportHelper::ResetAttributes() { - if (pPrevStyleName) - delete pPrevStyleName; - if (pPrevCurrency) - delete pPrevCurrency; + delete pPrevStyleName; + delete pPrevCurrency; pPrevStyleName = pStyleName; pPrevCurrency = pCurrency; nPrevCellType = nCellType; @@ -331,8 +325,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) ScRange aRange(rRange); aRange.aStart.SetCol(nStartCol); aRange.aEnd.SetCol(i - 1); - if (pPrevStyleName) - delete pPrevStyleName; + delete pPrevStyleName; pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); AddSingleRange(aRange); nStartCol = i; @@ -343,8 +336,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) { ScRange aRange(rRange); aRange.aStart.SetCol(nStartCol); - if (pPrevStyleName) - delete pPrevStyleName; + delete pPrevStyleName; pPrevStyleName = new rtl::OUString(aPrevItr->sStyleName); AddSingleRange(aRange); } @@ -360,8 +352,7 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) } else { - if (pPrevStyleName) - delete pPrevStyleName; + delete pPrevStyleName; pPrevStyleName = new rtl::OUString(aRowDefaultStyle->sStyleName); AddSingleRange(rRange); } @@ -411,10 +402,8 @@ void ScMyStylesImportHelper::SetRowStyle(const rtl::OUString& sStyleName) void ScMyStylesImportHelper::SetAttributes(rtl::OUString* pStyleNameP, rtl::OUString* pCurrencyP, const sal_Int16 nCellTypeP) { - if (this->pStyleName) - delete this->pStyleName; - if (this->pCurrency) - delete this->pCurrency; + delete this->pStyleName; + delete this->pCurrency; this->pStyleName = pStyleNameP; this->pCurrency = pCurrencyP; this->nCellType = nCellTypeP; |