diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 10:29:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 10:29:38 +0000 |
| commit | 5be98eba1fddb559194066c511b53412009c2d5d (patch) | |
| tree | 538903c2049093b623e6bd26fd2d0c0396fa43a0 /sfx2/source/dialog/partwnd.cxx | |
| parent | 45967111901ed4b8f9439bdf538fbbf5a6dd4a64 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sfx2/source/dialog/partwnd.cxx')
| -rw-r--r-- | sfx2/source/dialog/partwnd.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index c384383b2074..a25a794b7362 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: partwnd.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mba $ $Date: 2002-09-30 17:05:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 11:28:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -219,16 +219,19 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl() // frame reference in our own DisposingListener. // But don't do it, if xFrame already exist. Then dispose() must come from inside ... // and we need a valid pMgr for further operations ... - SfxPartDockWnd_Impl* pWin = (SfxPartDockWnd_Impl*) pWindow; - if( pWin != NULL && !xFrame.is() ) - pWin->ReleaseChildWindow_Impl(); + SfxPartDockWnd_Impl* pWin = (SfxPartDockWnd_Impl*) pWindow; +// if( pWin != NULL && !xFrame.is() ) +// pWin->ReleaseChildWindow_Impl(); +/* // Release frame and window. // If frame reference is valid here ... start dieing from inside by calling dispose(). SetFrame( NULL ); pWindow = NULL; +*/ if ( pWin && xFrame == pWin->GetBindings().GetActiveFrame() ) - pWin->GetBindings().SetActiveFrame( GetFrame() ); + pWin->GetBindings().SetActiveFrame( NULL ); +/* if( xFrame.is() ) { try @@ -248,6 +251,7 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl() { } } + */ } sal_Bool SfxPartChildWnd_Impl::QueryClose() |