diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 14:28:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 14:28:31 +0000 |
| commit | ff3200205b17101ef8e1ccc5163789a0f89d244a (patch) | |
| tree | 4037a1e4bd29726687bb50afaa3a2177e1131d77 /sd/source | |
| parent | 01be1f312a26a30c3322e092c612f41e48c21f85 (diff) | |
INTEGRATION: CWS impress10 (1.42.26); FILE MERGED
2004/11/08 13:12:30 af 1.42.26.3: RESYNC: (1.43-1.44); FILE MERGED
2004/10/15 10:50:37 af 1.42.26.2: RESYNC: (1.42-1.43); FILE MERGED
2004/10/07 12:09:12 af 1.42.26.1: #i35109# Moved selection of object bar depening on view context to ObjectBarManager.
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 14c519399570..1bd97ee4c47d 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews1.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: hr $ $Date: 2004-11-26 15:03:57 $ + * last change: $Author: rt $ $Date: 2004-11-26 15:28:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,8 +212,10 @@ void DrawViewShell::Activate(BOOL bIsMDIActivate) ViewShell::Activate(bIsMDIActivate); // When no object bars are active then activate some. - if (GetObjectBarManager().GetTopObjectBarId() == snInvalidShellId) - GetObjectBarManager().SwitchObjectBar (RID_DRAW_OBJ_TOOLBOX); + ObjectBarManager& rObjectBarManager (GetObjectBarManager()); + if (rObjectBarManager.GetTopObjectBarId() == snInvalidShellId) + rObjectBarManager.SwitchObjectBar ( + rObjectBarManager.GetDefaultObjectBarId()); if (bIsMDIActivate) { @@ -373,19 +375,7 @@ void DrawViewShell::SelectionHasChanged (void) } else { - USHORT nObjBarId; - - switch( pDrView->GetContext() ) - { - case( SDRCONTEXT_POINTEDIT ): nObjBarId = RID_BEZIER_TOOLBOX; break; - case( SDRCONTEXT_GRAPHIC ): nObjBarId = RID_DRAW_GRAF_TOOLBOX; break; - case( SDRCONTEXT_TEXTEDIT ): nObjBarId = RID_DRAW_TEXT_TOOLBOX; break; - case( SDRCONTEXT_MEDIA ): nObjBarId = RID_DRAW_MEDIA_TOOLBOX; break; - - default: nObjBarId = RID_DRAW_OBJ_TOOLBOX; break; - } - - rObjectBarManager.SwitchObjectBar (nObjBarId); + GetObjectBarManager().SelectionHasChanged (pDrView); } // #96124# Invalidate for every subshell |