diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:15:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:15:43 +0000 |
| commit | dd06dbcf04fdf005da9a01a1a4d46b71c0baa9eb (patch) | |
| tree | d282e20078f99a86ab0045c0c4169b2a8d73ff6c /sd/source/ui/func/fuconarc.cxx | |
| parent | a414f5d29e351eaf19c0695b4099157e926da5c8 (diff) | |
INTEGRATION: CWS viewswitch (1.10.70); FILE MERGED
2006/01/19 17:13:13 af 1.10.70.3: RESYNC: (1.10-1.11); FILE MERGED
2005/11/29 10:59:19 af 1.10.70.2: #i57552# Adaption to changes in ToolBarManager.
2005/11/17 13:22:08 af 1.10.70.1: #i57551# Replaced ObjectBarManager by ToolBarManager.
Diffstat (limited to 'sd/source/ui/func/fuconarc.cxx')
| -rw-r--r-- | sd/source/ui/func/fuconarc.cxx | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 2254588daecb..8448a78b4efb 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fuconarc.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2005-12-14 16:55:29 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:15:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,19 +67,22 @@ #include "app.hrc" -#ifndef SD_VIEW_SHELL_HXX -#include "ViewShell.hxx" -#endif -#ifndef SD_VIEW_HXX -#include "View.hxx" -#endif #ifndef SD_WINDOW_HXX #include "Window.hxx" #endif #include "drawdoc.hxx" #include "res_bmp.hrc" -#ifndef SD_OBJECT_BAR_MANAGER_HXX -#include "ObjectBarManager.hxx" +#ifndef SD_VIEW_HXX +#include "View.hxx" +#endif +#ifndef SD_VIEW_SHELL_HXX +#include "ViewShell.hxx" +#endif +#ifndef SD_VIEW_SHELL_BASE_HXX +#include "ViewShellBase.hxx" +#endif +#ifndef SD_TOOL_BAR_MANAGER_HXX +#include "ToolBarManager.hxx" #endif // #97016# @@ -120,7 +123,9 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) { FuConstruct::DoExecute( rReq ); - pViewShell->GetObjectBarManager().SwitchObjectBar (RID_DRAW_OBJ_TOOLBOX); + pViewShell->GetViewShellBase().GetToolBarManager().SetToolBar( + ToolBarManager::TBG_FUNCTION, + ToolBarManager::msDrawingObjectToolBar); const SfxItemSet *pArgs = rReq.GetArgs (); |