From b6d6dab920a9e14a6fe9c61446da64ab62dcbfdf Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 10 Mar 2015 13:07:45 +0000 Subject: V668 no sense in testing the result of new against null Change-Id: I1cff71d15f4d1b5ee47cc734b3fc2168d7f99201 --- sc/source/ui/namedlg/namedefdlg.cxx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'sc/source/ui/namedlg') diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 43b4ecc6182c..b784e93ddddb 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -204,23 +204,20 @@ void ScNameDefDlg::AddPushed() { if ( mpDoc ) { - ScRangeData* pNewEntry = NULL; RangeType nType = RT_NAME; - pNewEntry = new ScRangeData( mpDoc, + ScRangeData* pNewEntry = new ScRangeData( mpDoc, aName, aExpression, maCursorPos, nType ); - if (pNewEntry) - { - nType = nType - | (m_pBtnRowHeader->IsChecked() ? RT_ROWHEADER : RangeType(0)) - | (m_pBtnColHeader->IsChecked() ? RT_COLHEADER : RangeType(0)) - | (m_pBtnPrintArea->IsChecked() ? RT_PRINTAREA : RangeType(0)) - | (m_pBtnCriteria->IsChecked() ? RT_CRITERIA : RangeType(0)); - pNewEntry->AddType(nType); - } + + nType = nType + | (m_pBtnRowHeader->IsChecked() ? RT_ROWHEADER : RangeType(0)) + | (m_pBtnColHeader->IsChecked() ? RT_COLHEADER : RangeType(0)) + | (m_pBtnPrintArea->IsChecked() ? RT_PRINTAREA : RangeType(0)) + | (m_pBtnCriteria->IsChecked() ? RT_CRITERIA : RangeType(0)); + pNewEntry->AddType(nType); // aExpression valid? if ( 0 == pNewEntry->GetErrCode() ) -- cgit