diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 09:46:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 09:46:13 +0000 |
| commit | f41d396d6cf152f8ecfbdf9659906515ee7d7f2e (patch) | |
| tree | bdcf77d04ed4e168b985b154c6948be67cc675c1 /sd/source/ui/slideshow/slideshowimpl.cxx | |
| parent | 6606f6c21c808d2945f7386aac58b7373ad1a30d (diff) | |
INTEGRATION: CWS impress49 (1.18.10); FILE MERGED
2005/07/19 08:46:50 cl 1.18.10.4: RESYNC: (1.20-1.21); FILE MERGED
2005/05/25 13:12:57 cl 1.18.10.3: #i38488# disable drawing layer animation on underlying view while slideshow
2005/05/18 11:21:22 cl 1.18.10.2: RESYNC: (1.18-1.20); FILE MERGED
2005/04/22 15:39:02 cl 1.18.10.1: #i46149# allow go to previous slide for slides with only one slide on end slide
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.cxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index e3a56a94e655..0ff829fbdbb7 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: slideshowimpl.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:07:43 $ + * last change: $Author: hr $ $Date: 2005-09-23 10:46:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -436,7 +436,10 @@ bool SlideshowImpl::startPreview( } if( mpView ) + { mpView->AddWin( mpShowWindow ); + mpView->SetAnimationPause( TRUE ); + } // call resize handler if( pParent ) @@ -660,7 +663,10 @@ bool SlideshowImpl::startShow( PresentationSettings* pPresSettings ) */ if( mpView ) + { mpView->AddWin( mpShowWindow ); + mpView->SetAnimationPause( TRUE ); + } SfxBindings& rBindings = getViewFrame()->GetBindings(); rBindings.Invalidate( SID_PRESENTATION ); @@ -864,6 +870,9 @@ void SlideshowImpl::stopShow() if( mpShowWindow && mpView ) mpView->DelWin( mpShowWindow ); + if( mpView ) + mpView->SetAnimationPause( FALSE ); + if( mpViewShell ) { mpViewShell->SetActiveWindow(mpOldActiveWindow); @@ -1241,7 +1250,7 @@ void SlideshowImpl::gotoPreviousSlide() if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_END ) { const sal_Int32 nLastPageIndex = mpAnimationPageList->getPageIndexCount() - 1; - if( nLastPageIndex > 0 ) + if( nLastPageIndex >= 0 ) mpShowWindow->RestartShow( nLastPageIndex ); } else if( mpAnimationPageList->getCurrentPageIndex() > 0 ) |