diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 14:10:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 14:10:47 +0000 |
| commit | 86a507150305f637cc9ee723bd2393eb3fa7613b (patch) | |
| tree | 7597bb923086f3d134f41bb8d1303a72c4751eeb /sd | |
| parent | 481e634438f58e1a5f3847468a98a68addb6ba8c (diff) | |
INTEGRATION: CWS impress10 (1.27.26); FILE MERGED
2004/10/15 10:36:54 af 1.27.26.2: RESYNC: (1.27-1.28); FILE MERGED
2004/10/07 12:07:47 af 1.27.26.1: #i35109# Moved selection of object bar depening on view context to ObjectBarManager.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 2cc0b8245678..798b42c8ca3d 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusel.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: kz $ $Date: 2004-10-04 18:33:48 $ + * last change: $Author: rt $ $Date: 2004-11-26 15:10:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1207,21 +1207,8 @@ void FuSelection::SelectionHasChanged() Activate(); } - /************************************************************************** - * ObjectBar einschalten - **************************************************************************/ - USHORT nObjBarId; - - switch( pView->GetContext() ) - { - case( SDRCONTEXT_POINTEDIT ): nObjBarId = RID_BEZIER_TOOLBOX; break; - case( SDRCONTEXT_GRAPHIC ): nObjBarId = RID_DRAW_GRAF_TOOLBOX; break; - case( SDRCONTEXT_MEDIA ): nObjBarId = RID_DRAW_MEDIA_TOOLBOX; break; - - default: nObjBarId = RID_DRAW_OBJ_TOOLBOX; break; - } - - pViewShell->GetObjectBarManager().SwitchObjectBar (nObjBarId); + // Activate the right tool bar for the current context of the view. + pViewShell->GetObjectBarManager().SelectionHasChanged (pView); } |