From 73249ed1af48d03de81491cefc41b0a6fc101093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 26 Nov 2004 19:05:58 +0000 Subject: [PATCH] INTEGRATION: CWS presentationengine01 (1.8.70); FILE MERGED 2004/10/12 23:07:26 thb 1.8.70.2: RESYNC: (1.8-1.10); FILE MERGED 2004/08/25 16:31:41 cl 1.8.70.1: replaced old FuSlideShow with new SlideShow --- sd/source/ui/docshell/docshel3.cxx | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 90d285a2cd8e..483987e1fe26 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docshel3.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2004-09-17 14:25:57 $ + * last change: $Author: rt $ $Date: 2004-11-26 20:05:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,8 +140,8 @@ #ifndef SD_VIEW_HXX #include "View.hxx" #endif -#ifndef SD_FU_SLIDE_SHOW_HXX -#include "fuslshow.hxx" +#ifndef _SD_SLIDESHOW_HXX +#include "slideshow.hxx" #endif #include "fuhhconv.hxx" @@ -166,15 +166,10 @@ namespace sd { void DrawDocShell::Execute( SfxRequest& rReq ) { - if (pViewShell) + if(pViewShell && pViewShell->GetSlideShow()) { - FuSlideShow* pFuSlideShow = pViewShell->GetSlideShow(); - - if (pFuSlideShow && !pFuSlideShow->IsLivePresentation()) - { - // Waehrend einer Native-Diashow wird nichts ausgefuehrt! - return; - } + // during a running presentation no slot will be executed + return; } switch ( rReq.GetSlot() )