View | Details | Raw Unified | Return to issue 97129
Collapse All | Expand All

(-)sd/source/ui/slideshow/slideshowimpl.cxx (-1 / +14 lines)
Lines 171-176 Link Here
171
171
172
	sal_Int32 getNextSlideIndex() const;
172
	sal_Int32 getNextSlideIndex() const;
173
	sal_Int32 getPreviousSlideIndex() const;
173
	sal_Int32 getPreviousSlideIndex() const;
174
	sal_Int32 getLastVisibleSlideIndex() const;
174
175
175
	bool isVisibleSlideNumber( sal_Int32 nSlideNumber ) const;
176
	bool isVisibleSlideNumber( sal_Int32 nSlideNumber ) const;
176
177
Lines 464-469 Link Here
464
	return jumpToSlideIndex( getPreviousSlideIndex() );
465
	return jumpToSlideIndex( getPreviousSlideIndex() );
465
}
466
}
466
467
468
sal_Int32 AnimationSlideController::getLastVisibleSlideIndex() const
469
{
470
    sal_Int32 nNewSlideIndex = getSlideIndexCount() -1;
471
    while( isValidIndex( nNewSlideIndex ) )
472
    {
473
        if ( maSlideVisible[nNewSlideIndex] )
474
            break;
475
        nNewSlideIndex--;
476
    }
477
    return nNewSlideIndex;
478
}
479
467
void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow, 
480
void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow >& xShow, 
468
                                                    const Reference< XDrawPagesSupplier>& xDrawPages,
481
                                                    const Reference< XDrawPagesSupplier>& xDrawPages,
469
                                                    const bool bSkipAllMainSequenceEffects )
482
                                                    const bool bSkipAllMainSequenceEffects )
Lines 3373-3379 Link Here
3373
		const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
3386
		const ShowWindowMode eMode = mpShowWindow->GetShowWindowMode();
3374
		if( eMode == SHOWWINDOWMODE_END )
3387
		if( eMode == SHOWWINDOWMODE_END )
3375
		{
3388
		{
3376
			const sal_Int32 nLastSlideIndex = mpSlideController->getSlideIndexCount() - 1;
3389
			const sal_Int32 nLastSlideIndex = mpSlideController->getLastVisibleSlideIndex();
3377
			if( nLastSlideIndex >= 0 )
3390
			if( nLastSlideIndex >= 0 )
3378
				mpShowWindow->RestartShow( nLastSlideIndex );
3391
				mpShowWindow->RestartShow( nLastSlideIndex );
3379
		}
3392
		}

Return to issue 97129