[Libreoffice-commits] .: idl/source

David Tardon dtardon at kemper.freedesktop.org
Tue Mar 29 01:43:36 PDT 2011


 idl/source/objects/slot.cxx |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b6702790cda29c6b2e7b5ed24fe2a4e2110cf021
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 29 10:43:11 2011 +0200

    WaE: declaration of 'it' shadows a previous local

diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index ab27d1b..7bcc6d1 100755
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1192,14 +1192,16 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount,
         // look for the next slot with the same StateMethod like me
         // the slotlist is set to the current slot
 
-        SvSlotElementList::iterator it = ( pCurSlot != rSlotList.end() ) ? ++pCurSlot : rSlotList.end();
-
-        for ( ; it != rSlotList.end(); ++it)
         {
-            pNextSlot = (*it)->xSlot;
+            SvSlotElementList::iterator it = ( pCurSlot != rSlotList.end() ) ? ++pCurSlot : rSlotList.end();
 
-            if (!pNextSlot || (!pNextSlot->pNextSlot && pNextSlot->GetStateMethod() == GetStateMethod()) )
-                break;
+            for ( ; it != rSlotList.end(); ++it)
+            {
+                pNextSlot = (*it)->xSlot;
+
+                if (!pNextSlot || (!pNextSlot->pNextSlot && pNextSlot->GetStateMethod() == GetStateMethod()) )
+                    break;
+            }
         }
 
         if ( !pNextSlot )


More information about the Libreoffice-commits mailing list