diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:15:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:15:10 +0000 |
| commit | a414f5d29e351eaf19c0695b4099157e926da5c8 (patch) | |
| tree | f55e08441979f82ccfa5e49e0c6b376a38af9bdc /sd/source/ui/func/fucon3d.cxx | |
| parent | cc8c330b8f11e07af183c9e7b3d89fb9becce25c (diff) | |
INTEGRATION: CWS viewswitch (1.14.70); FILE MERGED
2006/01/19 17:13:04 af 1.14.70.3: RESYNC: (1.14-1.15); FILE MERGED
2005/11/29 10:57:29 af 1.14.70.2: #i57552# Adaption to changes in ToolBarManager.
2005/11/17 13:21:23 af 1.14.70.1: #i57551# Replaced ObjectBarManager by ToolBarManager.
Diffstat (limited to 'sd/source/ui/func/fucon3d.cxx')
| -rw-r--r-- | sd/source/ui/func/fucon3d.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 0ab8ce91fde5..a0de7e434d5e 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fucon3d.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-12-14 16:55:13 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:15:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,8 +79,11 @@ #include "ViewShell.hxx" #endif #include "drawdoc.hxx" -#ifndef SD_OBJECT_BAR_MANAGER_HXX -#include "ObjectBarManager.hxx" +#ifndef SD_VIEW_SHELL_BASE_HXX +#include "ViewShellBase.hxx" +#endif +#ifndef SD_TOOL_BAR_MANAGER_HXX +#include "ToolBarManager.hxx" #endif #ifndef _SVX3DITEMS_HXX @@ -124,7 +127,9 @@ FunctionReference FuConstruct3dObject::Create( ViewShell* pViewSh, ::sd::Window* void FuConstruct3dObject::DoExecute( SfxRequest& rReq ) { FuConstruct::DoExecute( rReq ); - pViewShell->GetObjectBarManager().SwitchObjectBar (RID_DRAW_OBJ_TOOLBOX); + pViewShell->GetViewShellBase().GetToolBarManager().SetToolBar( + ToolBarManager::TBG_FUNCTION, + ToolBarManager::msDrawingObjectToolBar); } /************************************************************************* |