diff options
| author | Noel Grandin <noel@peralex.com> | 2012-01-31 14:16:38 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-01-31 14:17:33 +0000 |
| commit | 5a71069339b3a3c118f3015d978799ef66db7564 (patch) | |
| tree | 3244dc4c91e6e2a0cfd70f8edca2e57ab36a5faf /sd/source/ui/slideshow | |
| parent | d1a84bdb8065c46d98908bc5caec4a995d4d196f (diff) | |
convert SdCustomeShow from tools/list to vector
Diffstat (limited to 'sd/source/ui/slideshow')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 8df640718584..d61899415384 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2485,7 +2485,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons // create animation slide controller AnimationSlideController::Mode eMode = - ( pCustomShow && pCustomShow->Count() ) ? AnimationSlideController::CUSTOM : + ( pCustomShow && pCustomShow->PagesVector().size() ) ? AnimationSlideController::CUSTOM : (bAll ? AnimationSlideController::ALL : AnimationSlideController::FROM); Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(), UNO_QUERY_THROW ); @@ -2546,11 +2546,11 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons mpSlideController->insertSlideNumber( (sal_uInt16) nSlide ); } - void* pCustomSlide; - sal_Int32 nSlideIndex; - for( pCustomSlide = pCustomShow->First(),nSlideIndex=0; pCustomSlide; pCustomSlide = pCustomShow->Next(), nSlideIndex++ ) + sal_Int32 nSlideIndex = 0; + for( SdCustomShow::PageVec::iterator it = pCustomShow->PagesVector().begin(); + it != pCustomShow->PagesVector().end(); ++it, nSlideIndex++ ) { - const sal_uInt16 nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2; + const sal_uInt16 nSdSlide = ( ( (SdPage*) (*it) )->GetPageNum() - 1 ) / 2; if( !( mpDoc->GetSdPage( nSdSlide, PK_STANDARD ) )->IsExcluded()) mpSlideController->insertSlideNumber( nSdSlide ); |