diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 19:31:21 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 19:31:21 +0000 |
| commit | a08cfded599cd6703179662ecee38b8cceaa5176 (patch) | |
| tree | 0bd1736b687eca14fb81b0144931708c78896daa /sd/source/ui/view/drviews4.cxx | |
| parent | 057bc5dd0f4a971ae0d9a24caf549f13ecdbc12b (diff) | |
INTEGRATION: CWS presentationengine01 (1.22.4); FILE MERGED
2004/10/12 23:25:05 thb 1.22.4.2: RESYNC: (1.22-1.23); FILE MERGED
2004/08/25 16:32:46 cl 1.22.4.1: replaced old FuSlideShow with new SlideShow
Diffstat (limited to 'sd/source/ui/view/drviews4.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews4.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 4bd73bbaf047..988c5173ac03 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews4.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2004-11-16 16:16:43 $ + * last change: $Author: rt $ $Date: 2004-11-26 20:31:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -137,8 +137,8 @@ #include "GraphicViewShell.hxx" #endif #include "sdpage.hxx" -#ifndef SD_FU_SLIDE_SHOW_HXX -#include "fuslshow.hxx" +#ifndef _SD_SLIDESHOW_HXX +#include "slideshow.hxx" #endif #include "anminfo.hxx" #include "sdpopup.hxx" @@ -576,9 +576,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { if ( !IsInputLocked() ) { - const BOOL bNativeShow = pFuSlideShow && - ( pFuSlideShow->GetAnimationMode() == ANIMATIONMODE_SHOW ) && - !pFuSlideShow->IsLivePresentation(); + const BOOL bNativeShow = mpSlideShow &&( mpSlideShow->getAnimationMode() == ANIMATIONMODE_SHOW ); if( rCEvt.GetCommand() == COMMAND_PASTESELECTION && !bNativeShow ) { |