[Libreoffice-commits] .: formula/source

[Libreoffice Gerrit user]

 formula/source/ui/dlg/FormulaHelper.cxx |    3 +--
 formula/source/ui/dlg/funcutl.cxx       |    8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit c0997ff4c829edfcf6123794cfbb4b8d999deb16
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Dec 22 00:01:45 2012 +0100

    Some cppcheck cleaning in formula
    
    Change-Id: I410ab7bbd74b616fcb0a3ed3b0c917cebeac23c6

diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index e787464..4c42c6b 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 edbfee0..36b3f04 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 )
             {