[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/ui/dbgui/pvlaydlg.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 82803aa044cbdaeac88668065a86c83cf5411005
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Dec 21 22:19:30 2010 -0500

    cppcheck: variable scope.

diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index b9b273f..ef6a9f8 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -594,14 +594,14 @@ void ScDPLayoutDlg::MoveField( ScDPFieldType eFromType, size_t nFromIndex, ScDPF
         ScDPFuncDataVec*    rmArr2   = NULL;
         GetOtherDataArrays(eToType, rmArr1, rmArr2);
 
-        size_t nAt = 0;
         bool bDataArr = eToType == TYPE_DATA;
 
         if ( fromArr && toArr && fromWnd && toWnd )
         {
             ScDPFuncData fData( *((*fromArr)[nFromIndex]) );
-
             bool bAllowed = IsOrientationAllowed( fData.mnCol, eToType );
+
+            size_t nAt = 0;
             if ( bAllowed && Contains( fromArr, fData.mnCol, nAt ) )
             {
                 fromWnd->DelField( nAt );
@@ -738,13 +738,13 @@ void ScDPLayoutDlg::MoveFieldToEnd( ScDPFieldType eFromType, size_t nFromIndex,
         ScDPFuncDataVec*    rmArr2   = NULL;
         GetOtherDataArrays(eToType, rmArr1, rmArr2);
 
-        size_t nAt = 0;
         bool bDataArr = eToType == TYPE_DATA;
 
         if ( fromArr && toArr && fromWnd && toWnd )
         {
             ScDPFuncData fData( *((*fromArr)[nFromIndex]) );
 
+            size_t nAt = 0;
             if ( Contains( fromArr, fData.mnCol, nAt ) )
             {
                 fromWnd->DelField( nAt );
@@ -806,7 +806,6 @@ void ScDPLayoutDlg::MoveFieldToEnd( ScDPFieldType eFromType, size_t nFromIndex,
         ScDPFieldControlBase* theWnd  = GetFieldWindow(eFromType);
         ScDPFuncDataVec*    theArr   = GetFieldDataArray(eFromType);
         size_t              nAt      = 0;
-        size_t              nToIndex = 0;
         Point               aToPos;
         BOOL                bDataArr = eFromType == TYPE_DATA;
 
@@ -814,6 +813,7 @@ void ScDPLayoutDlg::MoveFieldToEnd( ScDPFieldType eFromType, size_t nFromIndex,
 
         if ( Contains( theArr, fData.mnCol, nAt ) )
         {
+            size_t nToIndex = 0;
             theWnd->GetExistingIndex( aToPos, nToIndex );
 
             if ( nToIndex != nAt )