diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:45:34 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:45:34 +0000 |
| commit | 597c4ab1162395c4f6bc18cfe24ab3e1d9206829 (patch) | |
| tree | 1d234b8c5dfbce9e61cbb75902efc278e97ee436 /sd | |
| parent | 9b1ccaadab3b64d757db8a626cda5b2fa6524443 (diff) | |
INTEGRATION: CWS viewswitch (1.14.72); FILE MERGED
2005/11/17 15:23:58 af 1.14.72.1: #i57551# Replaced ObjectBarManager with ToolBarManager.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index d2951c9caecd..c7a74943d705 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviewsf.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-09 07:12:24 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:45:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,12 +122,12 @@ #ifndef SD_WINDOW_HXX #include "Window.hxx" #endif -#ifndef SD_OBJECT_BAR_MANAGER_HXX -#include "ObjectBarManager.hxx" -#endif #ifndef SD_VIEW_SHELL_BASE_HXX #include "ViewShellBase.hxx" #endif +#ifndef SD_FORM_SHELL_MANAGER_HXX +#include "FormShellManager.hxx" +#endif #include "cfgids.hxx" using namespace ::rtl; @@ -279,8 +279,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ATTR_YEAR2000) ) { - FmFormShell* pFormShell = static_cast<FmFormShell*>( - GetObjectBarManager().GetObjectBar(RID_FORMLAYER_TOOLBOX)); + FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager().GetFormShell(); if (pFormShell != NULL) { UINT16 nState = 0; |