diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 14:14:02 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 14:14:02 +0000 |
commit | 1a232c0720166c7e87a82d17229bee6eed57b7af (patch) | |
tree | d2429fc0a3a79722f8fcefb702a25321f12013f7 /sd/source/ui/dlg/PaneDockingWindow.cxx | |
parent | 9bbb75a49cfed8647d17129399843a1e3d82bca5 (diff) |
INTEGRATION: CWS impress19 (1.4.66); FILE MERGED
2004/11/09 14:40:58 af 1.4.66.1: #i32743# Docking window is registered at system window to be considered while keyboard focus traveling.
Diffstat (limited to 'sd/source/ui/dlg/PaneDockingWindow.cxx')
-rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 56ef6a634db8..d129186286a0 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PaneDockingWindow.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2004-11-16 16:11:51 $ + * last change: $Author: hr $ $Date: 2004-11-26 15:14:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,9 @@ #include <sfx2/dispatch.hxx> #endif #include <vcl/toolbox.hxx> +#ifndef _SV_TASKPANELIST_HXX +#include <vcl/taskpanelist.hxx> +#endif namespace sd { @@ -100,6 +103,12 @@ PaneDockingWindow::PaneDockingWindow ( msTitle = pBase->GetPaneManager().GetWindowTitle (mePane); pBase->GetPaneManager().SetWindow (mePane, this); } + + // Tell the system window about the new docking window so that it can be + // reached via the keyboard. + SystemWindow* pSystemWindow = GetSystemWindow(); + if (pSystemWindow != NULL) + pSystemWindow->GetTaskPaneList()->AddWindow(this); } @@ -109,6 +118,13 @@ PaneDockingWindow::~PaneDockingWindow (void) { ViewShellBase* pBase = ViewShellBase::GetViewShellBase( GetBindings().GetDispatcher()->GetFrame()); + + // Tell the next system window that the docking window is no longer + // available. + SystemWindow* pSystemWindow = GetSystemWindow(); + if (pSystemWindow != NULL) + pSystemWindow->GetTaskPaneList()->RemoveWindow(this); + // Tell the ViewShellBase that the window of this slide sorter is not // available anymore. if (pBase != NULL) |