diff options
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r-- | sd/source/ui/slideshow/SlideShowRestarter.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 18 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index c18a4aae19d4..d4611afbcf1c 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -82,7 +82,7 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation, void*, void) mnEventId = nullptr; if (mpSlideShow.is()) { - if (mnDisplayCount != (sal_Int32)Application::GetScreenCount()) + if (mnDisplayCount != static_cast<sal_Int32>(Application::GetScreenCount())) { bool bIsExitAfterPresenting = mpSlideShow->IsExitAfterPresenting(); mpSlideShow->SetExitAfterPresenting(false); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 0944af55018d..f738688983a9 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -726,7 +726,7 @@ void SAL_CALL SlideShow::end() // switch to the previously visible Slide DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>( pViewShell ); if( pDrawViewShell ) - pDrawViewShell->SwitchPage( (sal_uInt16)xController->getRestoreSlide() ); + pDrawViewShell->SwitchPage( static_cast<sal_uInt16>(xController->getRestoreSlide()) ); else { Reference<XDrawView> xDrawView ( @@ -1150,7 +1150,7 @@ sal_Int32 SlideShow::GetDisplay() if( nDisplay < 0 ) nDisplay = -1; else if( nDisplay == 0) - nDisplay = (sal_Int32)Application::GetDisplayExternalScreen(); + nDisplay = static_cast<sal_Int32>(Application::GetDisplayExternalScreen()); else nDisplay--; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 4dddb8e702f8..7983130d1783 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -150,7 +150,7 @@ private: bool getSlideAPI( sal_Int32 nSlideNumber, Reference< XDrawPage >& xSlide, Reference< XAnimationNode >& xAnimNode ); sal_Int32 findSlideIndex( sal_Int32 nSlideNumber ) const; - bool isValidIndex( sal_Int32 nIndex ) const { return (nIndex >= 0) && (nIndex < (sal_Int32)maSlideNumbers.size()); } + bool isValidIndex( sal_Int32 nIndex ) const { return (nIndex >= 0) && (nIndex < static_cast<sal_Int32>(maSlideNumbers.size())); } bool isValidSlideNumber( sal_Int32 nSlideNumber ) const { return (nSlideNumber >= 0) && (nSlideNumber < mnSlideCount); } private: @@ -1107,7 +1107,7 @@ void SlideshowImpl::onFirstPaint() } SolarMutexGuard aSolarGuard; - maUpdateTimer.SetTimeout( (sal_uLong)100 ); + maUpdateTimer.SetTimeout( sal_uLong(100) ); maUpdateTimer.Start(); } @@ -1978,12 +1978,12 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) { if( mpSlideController->isVisibleSlideNumber( nPageNumber ) ) { - SdPage* pPage = mpDoc->GetSdPage((sal_uInt16)nPageNumber, PageKind::Standard); + SdPage* pPage = mpDoc->GetSdPage(static_cast<sal_uInt16>(nPageNumber), PageKind::Standard); if (pPage) { - pPageMenu->InsertItem( (sal_uInt16)(CM_SLIDES + nPageNumber), pPage->GetName() ); + pPageMenu->InsertItem( static_cast<sal_uInt16>(CM_SLIDES + nPageNumber), pPage->GetName() ); if( nPageNumber == nCurrentSlideNumber ) - pPageMenu->CheckItem( (sal_uInt16)(CM_SLIDES + nPageNumber) ); + pPageMenu->CheckItem( static_cast<sal_uInt16>(CM_SLIDES + nPageNumber) ); } } } @@ -2244,7 +2244,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) for( nSlide = 0, nFirstVisibleSlide = -1; ( nSlide < nSlideCount ) && ( -1 == nFirstVisibleSlide ); nSlide++ ) { - SdPage* pTestSlide = mpDoc->GetSdPage( (sal_uInt16)nSlide, PageKind::Standard ); + SdPage* pTestSlide = mpDoc->GetSdPage( static_cast<sal_uInt16>(nSlide), PageKind::Standard ); if( pTestSlide->GetName() == rPresSlide ) { @@ -2263,7 +2263,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) for( sal_Int32 i = 0; i < nSlideCount; i++ ) { - bool bVisible = ! mpDoc->GetSdPage( (sal_uInt16)i, PageKind::Standard )->IsExcluded(); + bool bVisible = ! mpDoc->GetSdPage( static_cast<sal_uInt16>(i), PageKind::Standard )->IsExcluded(); if( bVisible || (eMode == AnimationSlideController::ALL) ) mpSlideController->insertSlideNumber( i, bVisible ); } @@ -2276,11 +2276,11 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) { sal_Int32 nSlide; for( nSlide = 0; nSlide < nSlideCount; nSlide++ ) - if( rPresSlide == mpDoc->GetSdPage( (sal_uInt16) nSlide, PageKind::Standard )->GetName() ) + if( rPresSlide == mpDoc->GetSdPage( static_cast<sal_uInt16>(nSlide), PageKind::Standard )->GetName() ) break; if( nSlide < nSlideCount ) - mpSlideController->insertSlideNumber( (sal_uInt16) nSlide ); + mpSlideController->insertSlideNumber( static_cast<sal_uInt16>(nSlide) ); } sal_Int32 nSlideIndex = 0; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 433db37cda52..881ad6ed4613 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -329,15 +329,15 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) if( meAnimationMode != ANIMATIONMODE_SHOW ) { - aOutputSize.Width() = (long)( aOutputSize.Width() / 1.03 ); - aOutputSize.Height() = (long)( aOutputSize.Height() / 1.03 ); + aOutputSize.Width() = static_cast<long>( aOutputSize.Width() / 1.03 ); + aOutputSize.Height() = static_cast<long>( aOutputSize.Height() / 1.03 ); } SdPage* pP = mpDoc->GetSdPage( 0, PageKind::Standard ); Size aPageSize( pP->GetSize() ); - const double page_ratio = (double)aPageSize.Width() / (double)aPageSize.Height(); - const double output_ratio = (double)aOutputSize.Width() / (double)aOutputSize.Height(); + const double page_ratio = static_cast<double>(aPageSize.Width()) / static_cast<double>(aPageSize.Height()); + const double output_ratio = static_cast<double>(aOutputSize.Width()) / static_cast<double>(aOutputSize.Height()); if( page_ratio > output_ratio ) { |