[Libreoffice-commits] core.git: vcl/generic

[Julien Nabet]

 vcl/generic/app/gendisp.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b2f6ef8423ca4f3c18c1603c3561388088fbc0cb
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Aug 24 19:28:56 2013 +0200

    Simplify a bit iterator management
    
    Change-Id: Id15fb18df7b1a8da1ff260f8b2c72ed6cd5d352a
    Reviewed-on: https://gerrit.libreoffice.org/5605
    Tested-by: Jan Holesovsky <kendy at suse.cz>
    Reviewed-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/vcl/generic/app/gendisp.cxx b/vcl/generic/app/gendisp.cxx
index fffb5aa..0e197c1 100644
--- a/vcl/generic/app/gendisp.cxx
+++ b/vcl/generic/app/gendisp.cxx
@@ -113,18 +113,18 @@ void SalGenericDisplay::CancelInternalEvent( SalFrame* pFrame, void* pData, sal_
     {
         if( ! m_aUserEvents.empty() )
         {
-            std::list< SalUserEvent >::iterator it, next;
-            next = m_aUserEvents.begin();
-            do
+            std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
+            while (it != m_aUserEvents.end())
             {
-                it = next++;
                 if( it->m_pFrame    == pFrame   &&
                     it->m_pData     == pData    &&
                     it->m_nEvent    == nEvent )
                 {
-                    m_aUserEvents.erase( it );
+                    it = m_aUserEvents.erase( it );
                 }
-            } while( next != m_aUserEvents.end() );
+                else
+                    ++it;
+            }
         }
 
         osl_releaseMutex( m_aEventGuard );