[Libreoffice-commits] core.git: sw/source

[Julien Nabet]

 sw/source/ui/dbui/mmaddressblockpage.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 52e56c3c6c836fe1f27cbd05d7cbe92f62e1280a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Mar 17 10:58:46 2013 +0100

    coverity#705115 Using invalid iterator
    
    Change-Id: Ia8b5a0654ded07d939e8be93a2dea2a6f84165b3
    Reviewed-on: https://gerrit.libreoffice.org/2785
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index e07eb09..b81a767 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -905,14 +905,11 @@ void SwCustomizeAddressBlockDialog::MoveFocus( Window* pMember, bool bNext )
     else
     {
         ::std::vector< Window* >::iterator aSearch = aMemberIter;
-        if(aSearch == aControls.begin())
-            aSearch = aControls.end();
         while( true )
         {
             if(aSearch == aControls.begin())
                 aSearch = aControls.end();
-            else
-                --aSearch;
+            --aSearch;
             if( (*aSearch)->IsEnabled() )
             {
                 (*aSearch)->GrabFocus();