From 49fc129ac69797d8af695f880b0f55e71e646735 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Fri, 26 Nov 2004 14:10:29 +0000
Subject: INTEGRATION: CWS impress10 (1.8.214); FILE MERGED 2004/10/07 12:06:35
 af 1.8.214.1: #i35109# Added support of default object bar.

---
 sd/source/ui/func/fuconbez.cxx | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'sd/source/ui/func/fuconbez.cxx')

diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index cc4dd42ed7fa..13f68cc3ed47 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fuconbez.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2004-01-20 10:58:05 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 15:10:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -362,17 +362,14 @@ void FuConstructBezierPolygon::SelectionHasChanged()
 {
     FuDraw::SelectionHasChanged();
 
-    /**************************************************************************
-    * ObjectBar einschalten
-    **************************************************************************/
-    USHORT nObjBarId = RID_DRAW_OBJ_TOOLBOX;
+    // Depending on the context of the view we activate the bezier tool bar
+    // or switch back to the default tool bar.
+    ShellId nObjectBarId (pViewShell->GetObjectBarManager().GetDefaultObjectBarId());
 
     if (pView->GetContext() == SDRCONTEXT_POINTEDIT)
-    {
-        nObjBarId = RID_BEZIER_TOOLBOX;
-    }
+        nObjectBarId = RID_BEZIER_TOOLBOX;
 
-    pViewShell->GetObjectBarManager().SwitchObjectBar (nObjBarId);
+    pViewShell->GetObjectBarManager().SwitchObjectBar (nObjectBarId);
 }
 
 
-- 
cgit