From c10e8631dc8cedf9ec3818734ef598b42121e7f1 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 26 Nov 2004 14:30:10 +0000 Subject: INTEGRATION: CWS impress10 (1.27.24); FILE MERGED 2004/10/15 10:52:05 af 1.27.24.3: RESYNC: (1.27-1.28); FILE MERGED 2004/10/07 12:08:28 af 1.27.24.2: #i35109# Added support of default object bar. 2004/09/22 12:35:53 af 1.27.24.1: #i34247# Defer the setup of the object bars until in Init() we can create a controller (that in turn is now used by one of the object bars.) --- sd/source/ui/view/drviewsa.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'sd/source/ui/view/drviewsa.cxx') diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index bb43c510133d..bdaf0650662e 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewsa.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: obo $ $Date: 2004-11-17 15:14:48 $ + * last change: $Author: rt $ $Date: 2004-11-26 15:30:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -390,6 +390,10 @@ DrawViewShell::~DrawViewShell() void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) { + // Disable the switching of objects bars. It is enabled in Init() when + // there is a fully functional view shell. + GetObjectBarManager().DisableObjectBarSwitching(); + pFrameView->Connect(); SfxViewShell* pViewShell = GetViewShell(); @@ -586,12 +590,15 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) + void DrawViewShell::Init (void) { ViewShell::Init (); StartListening (*GetDocSh()); + GetViewShellBase().UpdateController (GetController()); + // Now that the controller that is used by at least the FormShell we can // allow the switching of object bars and switch to the default object // bar. -- cgit