|
Lines 806-818
Link Here
|
| 806 |
|
806 |
|
| 807 |
if( nSlide > nSlideNum ) |
807 |
if( nSlide > nSlideNum ) |
| 808 |
nSlideNum = -1; |
808 |
nSlideNum = -1; |
| 809 |
} |
809 |
else |
| 810 |
|
|
|
| 811 |
if( nSlideNum != -1 ) |
| 812 |
mpSlideController->setStartSlideNumber( nSlideNum ); |
810 |
mpSlideController->setStartSlideNumber( nSlideNum ); |
| 813 |
} |
811 |
} |
| 814 |
|
812 |
else |
| 815 |
// remember Slide number from where the show was started |
813 |
{ |
|
|
814 |
if( maPresSettings.mbCustomShow ) |
| 815 |
mpSlideController->setStartSlideNumber( mpSlideController->getSlideNumber( mpSlideController->getStartSlideIndex())); |
| 816 |
else |
| 817 |
{ |
| 818 |
USHORT nSlideNumTemple = nSlideNum; |
| 819 |
while( !mpSlideController->isVisibleSlideNumber( nSlideNumTemple )) |
| 820 |
nSlideNumTemple ++; |
| 821 |
mpSlideController->setStartSlideNumber( nSlideNumTemple ); |
| 822 |
} |
| 823 |
} |
| 824 |
} |
| 816 |
if( pStartPage ) |
825 |
if( pStartPage ) |
| 817 |
mnRestoreSlide = ( pStartPage->GetPageNum() - 1 ) / 2; |
826 |
mnRestoreSlide = ( pStartPage->GetPageNum() - 1 ) / 2; |
| 818 |
|
827 |
|
|
Lines 2406-2413
Link Here
|
| 2406 |
nFirstSlide = 0; |
2415 |
nFirstSlide = 0; |
| 2407 |
} |
2416 |
} |
| 2408 |
} |
2417 |
} |
| 2409 |
|
2418 |
for( sal_Int32 i = nFirstSlide; i < nSlideCount; i++ ) |
| 2410 |
for( sal_Int32 i = 0; i < nSlideCount; i++ ) |
|
|
| 2411 |
{ |
2419 |
{ |
| 2412 |
bool bVisible = ( mpDoc->GetSdPage( (USHORT)i, PK_STANDARD ) )->IsExcluded() ? false : true; |
2420 |
bool bVisible = ( mpDoc->GetSdPage( (USHORT)i, PK_STANDARD ) )->IsExcluded() ? false : true; |
| 2413 |
if( bVisible || (eMode == AnimationSlideController::ALL) ) |
2421 |
if( bVisible || (eMode == AnimationSlideController::ALL) ) |