From c0997ff4c829edfcf6123794cfbb4b8d999deb16 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 22 Dec 2012 00:01:45 +0100 Subject: Some cppcheck cleaning in formula Change-Id: I410ab7bbd74b616fcb0a3ed3b0c917cebeac23c6 --- formula/source/ui/dlg/FormulaHelper.cxx | 3 +-- formula/source/ui/dlg/funcutl.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'formula') diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index e7874648bb3b..4c42c6bc4455 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -72,12 +72,11 @@ sal_Bool FormulaHelper::GetNextFunc( const String& rFormula, const IFunctionDescription** ppFDesc, // = NULL ::std::vector< ::rtl::OUString>* pArgs ) const // = NULL { - sal_Bool bFound = sal_False; xub_StrLen nOldStart = rFStart; String aFname; rFStart = GetFunctionStart( rFormula, rFStart, bBack, ppFDesc ? &aFname : NULL ); - bFound = ( rFStart != FUNC_NOTFOUND ); + sal_Bool bFound = ( rFStart != FUNC_NOTFOUND ); if ( bFound ) { diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index edbfee0bef38..36b3f04e60d1 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -114,7 +114,6 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt ) KeyCode aCode = rKEvt.GetKeyCode(); sal_Bool bUp = (aCode.GetCode() == KEY_UP); sal_Bool bDown = (aCode.GetCode() == KEY_DOWN); - ArgEdit* pEd = NULL; if ( pSlider && ( !aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() ) @@ -122,9 +121,10 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt ) { if ( nArgs > 1 ) { - long nThumb = pSlider->GetThumbPos(); - sal_Bool bDoScroll = sal_False; - sal_Bool bChangeFocus = sal_False; + ArgEdit* pEd = NULL; + long nThumb = pSlider->GetThumbPos(); + sal_Bool bDoScroll = sal_False; + sal_Bool bChangeFocus = sal_False; if ( bDown ) { -- cgit