diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 14:03:57 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-26 14:03:57 +0000 |
| commit | bb3e0817d82af536cb923598be0a30044f78235b (patch) | |
| tree | 9cb85a4d095596742cd0ac92348bff36f03c8669 /sd/source/ui/view/drviews1.cxx | |
| parent | df3362d2c29da51bea4253d039c06a1b0e6c85a6 (diff) | |
INTEGRATION: CWS impress16 (1.43.34); FILE MERGED
2004/11/02 13:23:42 af 1.43.34.2: RESYNC: (1.43-1.44); FILE MERGED
2004/10/26 12:22:13 dbo 1.43.34.1: #116388# automatic de/activation of extrusion bar depending on selection
Diffstat (limited to 'sd/source/ui/view/drviews1.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index bac248c3f447..14c519399570 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.45 $ + * $Revision: 1.46 $ * - * last change: $Author: obo $ $Date: 2004-11-16 16:16:26 $ + * last change: $Author: hr $ $Date: 2004-11-26 15:03:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,6 +119,9 @@ #endif #endif +#include <svx/dialogs.hrc> +#include <svx/extrusionbar.hxx> + #include "glob.hrc" #include "app.hrc" #include "res_bmp.hrc" @@ -271,6 +274,8 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate) void DrawViewShell::SelectionHasChanged (void) { + ObjectBarManager & rObjectBarManager = GetObjectBarManager(); + // Um die Performance zu steigern wird jetzt die komplette // Shell invalidiert statt alle Slots einzeln Invalidate(); @@ -380,11 +385,11 @@ void DrawViewShell::SelectionHasChanged (void) default: nObjBarId = RID_DRAW_OBJ_TOOLBOX; break; } - GetObjectBarManager().SwitchObjectBar (nObjBarId); + rObjectBarManager.SwitchObjectBar (nObjBarId); } // #96124# Invalidate for every subshell - GetObjectBarManager().InvalidateAllObjectBars(); + rObjectBarManager.InvalidateAllObjectBars(); if( SFX_APP()->GetHelpPI() ) SetHelpIdBySelection(); @@ -393,6 +398,17 @@ void DrawViewShell::SelectionHasChanged (void) if (GetController() != NULL) GetController()->FireSelectionChangeListener(); + + if (::svx::checkForSelectedCustomShapes( GetView(), + false /* ! bOnlyExtruded */ )) + { + rObjectBarManager.ActivateObjectBar(RID_SVX_EXTRUSION_BAR); + } + else + { + rObjectBarManager.DeactivateObjectBar( + rObjectBarManager.GetObjectBar(RID_SVX_EXTRUSION_BAR) ); + } } |