diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-09-05 08:01:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-09-05 08:01:51 +0000 |
| commit | e2f04fae289737f6b33f0e38f9bc1746f5eeac03 (patch) | |
| tree | cddef7ad10375b4b0b2b094eb71ec3c2234308dd /vcl | |
| parent | be032ba0705ffd653797a8c0b3a938ec638c9376 (diff) | |
INTEGRATION: CWS hr18 (1.65.56); FILE MERGED
2005/08/25 14:55:30 hr 1.65.56.3: #i53172#: SalDisplay::deregisterFrame(): fix loop
2005/08/15 14:01:59 hr 1.65.56.2: #i53172#: SalDisplay::deregisterFrame(): fix iteration over container
2005/08/10 14:27:48 hr 1.65.56.1: #i53172#: SalDisplay::deregisterFrame(): additional check for end of list condition
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 4609264d3253..35f774525eb1 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: saldisp.cxx,v $ * - * $Revision: 1.65 $ + * $Revision: 1.66 $ * - * last change: $Author: rt $ $Date: 2005-07-01 11:47:09 $ + * last change: $Author: rt $ $Date: 2005-09-05 09:01:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2908,14 +2908,13 @@ void SalDisplay::deregisterFrame( SalFrame* pFrame ) { if( osl_acquireMutex( hEventGuard_ ) ) { - for( std::list< SalUserEvent >::iterator it = m_aUserEvents.begin(); - it != m_aUserEvents.end(); ++it ) + std::list< SalUserEvent >::iterator it = m_aUserEvents.begin(); + while ( it != m_aUserEvents.end() ) { if( it->m_pFrame == pFrame ) - { - std::list< SalUserEvent >::iterator rit = it++; - m_aUserEvents.erase( rit ); - } + it = m_aUserEvents.erase( it ); + else + ++it; } osl_releaseMutex( hEventGuard_ ); } |