From a1b0b68c0f1fe2467cddf021e09123085d043de2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 22 Oct 2013 12:20:16 +0100 Subject: bStartWithActualSlide is always false Change-Id: Icf61858730e2576439fdc7bdd1c8a911f2b34bd7 --- sd/source/ui/slideshow/slideshowimpl.cxx | 6 +++--- sd/source/ui/slideshow/slideshowimpl.hxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sd/source/ui/slideshow') diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 33506755f475..7d6c44b1ed22 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -974,7 +974,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) } // build page list - createSlideList( maPresSettings.mbAll, false, aPresSlide ); + createSlideList( maPresSettings.mbAll, aPresSlide ); // remember Slide number from where the show was started if( pStartPage ) @@ -2467,7 +2467,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const // --------------------------------------------------------- -void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide ) +void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD ); @@ -2475,7 +2475,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons { SdCustomShow* pCustomShow; - if( !bStartWithActualSlide && mpDoc->GetCustomShowList() && maPresSettings.mbCustomShow ) + if( mpDoc->GetCustomShowList() && maPresSettings.mbCustomShow ) pCustomShow = mpDoc->GetCustomShowList()->GetCurObject(); else pCustomShow = NULL; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b0cbcf1249c8..48811dd975a0 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -267,7 +267,7 @@ private: double update(); - void createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide ); + void createSlideList( bool bAll, const OUString& rPresSlide ); void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false); -- cgit