From f126ff9c5ef8c88b930008759725353c6be687ce Mon Sep 17 00:00:00 2001 From: Pascal Junck Date: Thu, 28 Oct 2004 12:27:07 +0000 Subject: [PATCH] INTEGRATION: CWS impress20ea (1.7.4); FILE MERGED 2004/10/14 13:10:19 af 1.7.4.3: RESYNC: (1.7-1.8); FILE MERGED 2004/10/12 09:24:40 af 1.7.4.2: #i34881# Extended description of Init(). 2004/09/16 15:34:02 af 1.7.4.1: #i34011# Added argument to AssignFromSlideChangeWindow(). --- sd/source/ui/inc/ViewShell.hxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index e5b2a1d8011c..b99843854354 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ViewShell.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2004-10-04 18:36:38 $ + * last change: $Author: pjunck $ $Date: 2004-10-28 13:27:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,6 +202,9 @@ public: used for that part of the initialisation that can be run only after the creation of the new object is finished. This includes registration as listener at event broadcasters. + + Derived classes should call this method at the end of their + Init() methods. */ virtual void Init (void); @@ -340,7 +343,13 @@ public: BOOL bBackgroundFullSize ); void UpdateSlideChangeWindow(); - void AssignFromSlideChangeWindow(); + + /** Assign the slide change effect that is currently selected in the + slide change dialog to the selected slides or master pages. + @param eEditMode + This defines whether to assign to slides or master pages. + */ + void AssignFromSlideChangeWindow (EditMode eEditMode); void SetStartShowWithDialog( BOOL bIn = TRUE ) { bStartShowWithDialog = bIn; } BOOL IsStartShowWithDialog() const { return bStartShowWithDialog; }