diff options
| author | Frank Schönheit <fs@openoffice.org> | 2002-01-09 14:01:02 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2002-01-09 14:01:02 +0000 |
| commit | 644abfe93c6a92c90fadc60f42e59d67f0f5dba1 (patch) | |
| tree | 3263f53e6e142806c36d9061b3431ec07fb521e6 | |
| parent | 1010b03ff7979687338c9665eac1ac72fa799b6b (diff) | |
#96068# Controller::attach(NULL) when detaching from the controller
| -rw-r--r-- | svx/source/form/fmPropBrw.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index aa85d60950e4..232952a0722e 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmPropBrw.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: fs $ $Date: 2001-12-13 09:10:30 $ + * last change: $Author: fs $ $Date: 2002-01-09 15:01:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -374,8 +374,15 @@ void FmPropBrw::implDetachController() implSetNewObject(Reference< XPropertySet >()); if (m_xMeAsFrame.is()) m_xMeAsFrame->setComponent(NULL, NULL); - m_xBrowserController = NULL; - m_xMeAsFrame = NULL; + + // we attached a frame to the controller manually, so we need to manually tell it that it's detached, too + // 96068 - 09.01.2002 - fs@openoffice.org + Reference< XController > xAsXController( m_xBrowserController, UNO_QUERY ); + if ( xAsXController.is() ) + xAsXController->attachFrame( NULL ); + + m_xBrowserController.clear(); + m_xMeAsFrame.clear(); } //----------------------------------------------------------------------- |