diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-11-26 19:31:07 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-11-26 19:31:07 +0000 |
commit | 057bc5dd0f4a971ae0d9a24caf549f13ecdbc12b (patch) | |
tree | f3feb56f0ca6b47c6b609c8978d08140930d770d /sd/source/ui/view/drviews3.cxx | |
parent | 1185475200472589ce510c026629ebaf49d12059 (diff) |
INTEGRATION: CWS presentationengine01 (1.27.12); FILE MERGED
2004/10/12 23:24:57 thb 1.27.12.3: RESYNC: (1.27-1.29); FILE MERGED
2004/09/02 09:14:40 cl 1.27.12.2: fixes on slideshow
2004/08/25 16:32:46 cl 1.27.12.1: replaced old FuSlideShow with new SlideShow
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 3b98f9d83469..d5d9b2033aee 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2004-10-04 18:43:31 $ + * last change: $Author: rt $ $Date: 2004-11-26 20:31:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,8 +159,8 @@ #ifndef SD_FU_POOR_HXX #include "fupoor.hxx" #endif -#ifndef SD_FU_SLIDE_SHOW_HXX -#include "fuslshow.hxx" +#ifndef _SD_SLIDESHOW_HXX +#include "slideshow.hxx" #endif #ifndef SD_FRAME_VIEW #include "FrameView.hxx" @@ -253,11 +253,11 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) { BOOL bWasBasic = FALSE; - // Seitenwechsel in der Diashow abspielen - if (pFuSlideShow && rReq.GetArgs()) + // switch page in running slide show + if(mpSlideShow && rReq.GetArgs()) { SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, FALSE); - pFuSlideShow->JumpToPage((USHORT)pWhatPage->GetValue()); + mpSlideShow->jumpToPageNumber((sal_Int32)((pWhatPage->GetValue()-1)>>1)); } else { @@ -561,9 +561,9 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if (pBookmark) { - if (pFuSlideShow) + if(mpSlideShow) { - pFuSlideShow->JumpToBookmark(sBookmark); + mpSlideShow->jumpToBookmark(sBookmark); } else { |