diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-02-04 13:18:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-02-04 13:18:09 +0000 |
| commit | 479af32c982164cdda2be86736d224930c8973c3 (patch) | |
| tree | c71855e74c5aedbc405854dc7390c0d30ba727b6 /sd/source/ui/unoidl/DrawController.cxx | |
| parent | 213894685db28ea8b6015af90add2fbe62eea2fc (diff) | |
INTEGRATION: CWS impressbeta1 (1.10.78); FILE MERGED
2005/02/02 13:39:35 af 1.10.78.1: #i41870# dispose() takes view shells from shell stack.
Diffstat (limited to 'sd/source/ui/unoidl/DrawController.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 43d5ca300644..5ae92b516314 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DrawController.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2004-12-09 16:12:30 $ + * last change: $Author: rt $ $Date: 2005-02-04 14:18:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,12 @@ #include "Window.hxx" #include "DrawDocShell.hxx" #include "unomodel.hxx" +#ifndef SD_PANE_MANAGER_HXX +#include "PaneManager.hxx" +#endif +#ifndef SD_VIEW_SHELL_MANAGER_HXX +#include "ViewShellManager.hxx" +#endif #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> @@ -204,14 +210,16 @@ void SAL_CALL DrawController::dispose() { mbDisposing = true; + // When the controller has not been detached from its view + // shell, i.e. mpViewShell is not NULL, then tell PaneManager + // and ViewShellManager to clear the shell stack. + if (mpViewShell != NULL) + { + mrBase.GetPaneManager().Shutdown(true); + mrBase.GetViewShellManager().Shutdown(); + } + OPropertySetHelper::disposing(); - //AF BroadcastHelper is not used anymore. There is the BroadcastHelperOwner instead. -// OInterfaceContainerHelper* pListeners = getContainer(::getCppuType((Reference<view::XSelectionChangeListener>*)0)); -// if( pListeners ) -// { -// lang::EventObject aEventObj; -// pListeners->disposeAndClear(aEventObj); -// } SfxBaseController::dispose(); } |