Kaydet (Commit) a1b0b68c authored tarafından Caolán McNamara's avatar Caolán McNamara

bStartWithActualSlide is always false

Change-Id: Icf61858730e2576439fdc7bdd1c8a911f2b34bd7
üst ab1b996a
...@@ -974,7 +974,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) ...@@ -974,7 +974,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
} }
// build page list // build page list
createSlideList( maPresSettings.mbAll, false, aPresSlide ); createSlideList( maPresSettings.mbAll, aPresSlide );
// remember Slide number from where the show was started // remember Slide number from where the show was started
if( pStartPage ) if( pStartPage )
...@@ -2467,7 +2467,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const ...@@ -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 ); const long nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
...@@ -2475,7 +2475,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons ...@@ -2475,7 +2475,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
{ {
SdCustomShow* pCustomShow; SdCustomShow* pCustomShow;
if( !bStartWithActualSlide && mpDoc->GetCustomShowList() && maPresSettings.mbCustomShow ) if( mpDoc->GetCustomShowList() && maPresSettings.mbCustomShow )
pCustomShow = mpDoc->GetCustomShowList()->GetCurObject(); pCustomShow = mpDoc->GetCustomShowList()->GetCurObject();
else else
pCustomShow = NULL; pCustomShow = NULL;
......
...@@ -267,7 +267,7 @@ private: ...@@ -267,7 +267,7 @@ private:
double update(); double update();
void createSlideList( bool bAll, bool bStartWithActualSlide, const OUString& rPresSlide ); void createSlideList( bool bAll, const OUString& rPresSlide );
void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false); void displayCurrentSlide (const bool bSkipAllMainSequenceEffects = false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment