diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 08:54:29 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 08:54:29 +0000 |
| commit | c0e8380206604b412c25102cac5989259bb33fa8 (patch) | |
| tree | 6a4cfb859fec47a79c7cf8fb93cfa48858e61869 | |
| parent | 0e73a6b8f6ddfad831f68ba4b05e4d25d139028b (diff) | |
INTEGRATION: CWS mba204crashfixes (1.61.26); FILE MERGED
2006/07/20 16:34:57 mba 1.61.26.1: #127096#: remove superfluous code; #134165#: fix reentrance problems caused by temporarily existence of dead pointers
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 776287f2fcfb..201feaeea770 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: workwin.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: hr $ $Date: 2006-06-19 22:13:26 $ + * last change: $Author: ihi $ $Date: 2006-08-01 09:54:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -747,10 +747,10 @@ void SfxWorkWindow::DeleteControllers_Impl() } // Child-Windows l"oschen - USHORT nCount = pChildWins->Count(); - for ( n=0; n<nCount; n++ ) + for ( n=0; n<pChildWins->Count(); ) { SfxChildWin_Impl* pCW = (*pChildWins)[n]; + pChildWins->Remove(n); SfxChildWindow *pChild = pCW->pWin; if (pChild) { @@ -774,7 +774,6 @@ void SfxWorkWindow::DeleteControllers_Impl() pChild->Destroy(); } - delete pCW->pControl; delete pCW; // ATTENTION: The array itself is cleared after this loop!! @@ -783,10 +782,10 @@ void SfxWorkWindow::DeleteControllers_Impl() // See task 128307 (Windows) // Window::NotifyAllChilds() calls SfxWorkWindow::DataChanged_Impl for // 8-bit displays (WM_QUERYPALETTECHANGED message due to focus change)!! - (*pChildWins)[n] = 0; + //(*pChildWins)[n] = 0; } - pChildWins->Remove((USHORT)0, nCount); + //pChildWins->Remove((USHORT)0, nCount); Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface(); Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY ); |