User: ihi Date: 2006/10/18 06:32:12 Modified: dba/dbaccess/source/ui/querydesign/JoinTableView.cxx
Log: INTEGRATION: CWS dba205b (1.53.32); FILE MERGED 2006/08/03 12:51:44 oj 1.53.32.1: #137963# work on copy of tablewindows to avoid illegal iterators File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinTableView.cxx?r1=1.54&r2=1.55 Delta lines: +5 -7 ------------------- --- JoinTableView.cxx 17 Sep 2006 07:20:59 -0000 1.54 +++ JoinTableView.cxx 18 Oct 2006 13:32:10 -0000 1.55 @@ -1599,13 +1599,11 @@ OTableWindowMap* pTabWins = GetTabWinMap(); if ( pTabWins ) { - OTableWindowMap::iterator aIter = pTabWins->begin(); - while(aIter != pTabWins->end()) - { - OTableWindow* pTabWin = aIter->second; - ++aIter; - RemoveTabWin(pTabWin); - } + // working on a copy because the real list will be cleared in inner calls + OTableWindowMap aCopy(*pTabWins); + OTableWindowMap::iterator aIter = aCopy.begin(); + for(;aIter != aCopy.end();++aIter) + RemoveTabWin(aIter->second); } m_pView->getController()->setModified(sal_True); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
