diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 12:50:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 12:50:42 +0000 |
| commit | 14965dd2cda679d6cd407b06d0ca499fff3d490d (patch) | |
| tree | 52c678a43fa1149edad428fcf267ff034fbb7d30 /sd/source/ui/dlg/navigatr.cxx | |
| parent | 47acec701201d4e6f200d4ecc8dcf1c4a226aee3 (diff) | |
INTEGRATION: CWS impress2 (1.22.26); FILE MERGED
2004/05/23 13:23:50 af 1.22.26.2: #i22705# Adaption to change in ViewShellBase.
2004/02/25 13:01:02 af 1.22.26.1: #i22705# Adaption to modified shell handling.
Diffstat (limited to 'sd/source/ui/dlg/navigatr.cxx')
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 564c32db4a59..e76704c34f71 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: navigatr.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2004-01-20 10:46:56 $ + * last change: $Author: rt $ $Date: 2004-07-13 13:50:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,9 +117,6 @@ #ifndef SD_VIEW_SHELL_BASE_HXX #include "ViewShellBase.hxx" #endif -#ifndef SD_SUB_SHELL_MANAGER_HXX -#include "SubShellManager.hxx" -#endif #ifndef SD_DRAW_VIEW_SHELL_HXX #include "DrawViewShell.hxx" #endif @@ -750,11 +747,9 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) else { ::sd::ViewShellBase* pBase = - static_cast< ::sd::ViewShellBase*>( - pBindings->GetDispatcher()->GetFrame() - ->GetViewShell()); - ::sd::ViewShell* pViewShell = - pBase->GetSubShellManager().GetMainSubShell(); + ::sd::ViewShellBase::GetViewShellBase( + pBindings->GetDispatcher()->GetFrame()); + ::sd::ViewShell* pViewShell = pBase->GetMainViewShell(); if (pViewShell != NULL) { @@ -797,10 +792,9 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) else { ::sd::ViewShellBase* pBase = - static_cast< ::sd::ViewShellBase*>( - pBindings->GetDispatcher()->GetFrame()->GetViewShell()); - ::sd::ViewShell* pViewShell = - pBase->GetSubShellManager().GetMainSubShell(); + ::sd::ViewShellBase::GetViewShellBase( + pBindings->GetDispatcher()->GetFrame()); + ::sd::ViewShell* pViewShell = pBase->GetMainViewShell(); if (pViewShell != NULL) { ::sd::FuSlideShow* pFuSlideShow = pViewShell->GetSlideShow(); |