diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-06-13 10:09:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-06-15 13:34:14 +0200 |
| commit | 4ea281a3ccb5bd21e1808d8cb127a91a1bb72691 (patch) | |
| tree | 183a2ab634d770b7ef777323fa6851fc38e14011 /dbaccess | |
| parent | 943f4b4ff1c524c514584c459b899ba3e9dfb71f (diff) | |
cppcheck:redundantAssignment
Change-Id: I1167d0ce6b6f6e48309d0551c1d2a283d79546a7
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index a2490f3e4829..409469f82c26 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -420,10 +420,9 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n ensureFormatter(); if ( m_pFormatter && !m_sNumToken.isEmpty() ) { - double fOutNumber = 0.0; LanguageType eNumLang; sal_uInt32 nFormatKey(0); - fOutNumber = SfxHTMLParser::GetTableDataOptionsValNum(nFormatKey,eNumLang,m_sTextToken,m_sNumToken,*m_pFormatter); + double fOutNumber = SfxHTMLParser::GetTableDataOptionsValNum(nFormatKey,eNumLang,m_sTextToken,m_sNumToken,*m_pFormatter); if ( eNumLang != LANGUAGE_NONE ) { nFormatKey = m_pFormatter->GetFormatForLanguageIfBuiltIn( nFormatKey, eNumLang ); diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 153579fdab2d..4c687b06bca0 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1347,8 +1347,11 @@ namespace { _pSelectionBrw->DuplicateConditionLevel( nLevel); eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(0), nLevel,bHaving,bMustAddOrOnOneLine ); - ++nLevel; - eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(2), nLevel,bHaving,bMustAddOrOnOneLine ); + if ( eErrorCode == eOk ) + { + ++nLevel; + eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition->getChild(2), nLevel,bHaving,bMustAddOrOnOneLine ); + } } else eErrorCode = GetORCriteria(_pView,_pSelectionBrw,pSearchCondition, nLevel,bHaving,bMustAddOrOnOneLine ); |