diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-01-23 21:09:24 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-01-23 21:09:24 +0100 |
| commit | 82a061079ae03f841713fd26c809d45621a59836 (patch) | |
| tree | 417a28a69aa1761cfdb9f6401353ed7e5270221e /dbaccess | |
| parent | fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part. (diff) | |
| download | core-82a061079ae03f841713fd26c809d45621a59836.tar.gz core-82a061079ae03f841713fd26c809d45621a59836.zip | |
Fix fdo#44040 VIEWING: Crash when page preview after <f4> (data sources)
Caolán fixed Iterator management which was buggy. (thank you !)
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 4d980a0bf62b..6e311415d00b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1410,24 +1410,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr Reference< XDispatch > xSource(_rSource.Source, UNO_QUERY); if(xSource.is()) { - for ( ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin(); - aLoop != m_aExternalFeatures.end(); - ++aLoop - ) + ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin(); + ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end(); + while (aLoop != aEnd) { - if ( aLoop->second.xDispatcher.get() == xSource.get() ) + ExternalFeaturesMap::iterator aI = aLoop++; + if ( aI->second.xDispatcher.get() == xSource.get() ) { - ExternalFeaturesMap::iterator aPrevious = aLoop; - --aPrevious; + sal_uInt16 nSlot = aI->first; // remove it - m_aExternalFeatures.erase( aLoop ); + m_aExternalFeatures.erase(aI); // maybe update the UI - implCheckExternalSlot(aLoop->first); + implCheckExternalSlot(nSlot); // continue, the same XDispatch may be resposible for more than one URL - aLoop = aPrevious; } } } |