diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:43:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:43:22 +0000 |
| commit | ef27fc4231bbab127c9fe8ba0e3f4da10a159577 (patch) | |
| tree | a01e133639a1207f739bb14e30a40934f1f06d05 /sd | |
| parent | daf29ac4a91f87ebfec2046900ada6141382663f (diff) | |
INTEGRATION: CWS viewswitch (1.34.46); FILE MERGED
2006/01/19 17:55:32 af 1.34.46.2: RESYNC: (1.34-1.35); FILE MERGED
2005/11/17 15:19:43 af 1.34.46.1: #i57551# FormShell now accessible through FormShellManager.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index ff6656c964b5..6a40e5d23e77 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2005-12-14 17:27:02 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:43:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -155,15 +155,15 @@ #include "masterlayoutdlg.hxx" #include "Ruler.hxx" #include "DrawDocShell.hxx" -#ifndef SD_OBJECT_BAR_MANAGER_HXX -#include "ObjectBarManager.hxx" -#endif #include "sdabstdlg.hxx" //CHINA001 #include "PaneManager.hxx" #include <sfx2/ipclient.hxx> #ifndef SD_VIEW_SHELL_BASE_HXX #include "ViewShellBase.hxx" #endif +#ifndef SD_FORM_SHELL_MANAGER_HXX +#include "FormShellManager.hxx" +#endif #include "LayerTabBar.hxx" #include "sdabstdlg.hxx" //CHINA001 #include "sdpage.hxx" @@ -566,8 +566,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_ATTR_YEAR2000: { - FmFormShell* pFormShell = static_cast<FmFormShell*>( - GetObjectBarManager().GetObjectBar(RID_FORMLAYER_TOOLBOX)); + FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager().GetFormShell(); if (pFormShell != NULL) { const SfxPoolItem* pItem; |