diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:45:15 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:45:15 +0000 |
commit | 9b1ccaadab3b64d757db8a626cda5b2fa6524443 (patch) | |
tree | 72e1378f07ec8b4b6a948b688f92afdc1f09b810 /sd | |
parent | 1c19de1bafcedc67bd36c06f14a0203f5100c3b5 (diff) |
INTEGRATION: CWS viewswitch (1.55.70); FILE MERGED
2006/01/19 17:57:52 af 1.55.70.2: RESYNC: (1.55-1.57); FILE MERGED
2005/11/17 15:23:25 af 1.55.70.1: #i57551# Replaced ObjectBarManager with ToolBarManager.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 34afab769a5c..1207b5e4ce4c 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviewse.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: rt $ $Date: 2006-01-10 14:37:11 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:45:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -195,11 +195,8 @@ #ifndef SD_VIEW_SHELL_BASE_HXX #include "ViewShellBase.hxx" #endif -#ifndef SD_OBJECT_BAR_MANAGER_HXX -#include "ObjectBarManager.hxx" -#endif -#ifndef SD_VIEW_SHELL_BASE_HXX -#include "ViewShellBase.hxx" +#ifndef SD_TOOL_BAR_MANAGER_HXX +#include "ToolBarManager.hxx" #endif // #97016# @@ -839,7 +836,8 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) ******************************************************************/ if( dynamic_cast< FuSelection* >( GetCurrentFunction().get() ) || dynamic_cast< FuConstructBezierPolygon* >( GetCurrentFunction().get() ) ) { - GetObjectBarManager().SelectionHasChanged(pDrView);//context has changed + // Tell the tool bar manager about the context change. + GetViewShellBase().GetToolBarManager().SelectionHasChanged(*this,*pDrView); } Invalidate(SID_BEZIER_EDIT); |