summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-09 14:37:43 +0200
committerNoel Grandin <noel@peralex.com>2016-03-10 10:09:59 +0200
commitf946e905c6c6bb041ae580b14b711c6964af97bd (patch)
tree6e20ce0c463b60eca951f9d9f2cc48b8b5c4bca6 /sd/source/ui/slideshow
parent451dd390894e0adb6ac1349fcef88eaedff79d29 (diff)
loplugin:constantparam in sd
Change-Id: I7f5065c08f539ceefa4b8d3925b9c09e72b25a44
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/showwin.cxx6
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 85be7aaca1d2..eeb01c664db5 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -324,7 +324,7 @@ void ShowWindow::SetEndMode()
}
}
-bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo )
+bool ShowWindow::SetPauseMode( sal_Int32 nTimeout, Graphic* pLogo )
{
rtl::Reference< SlideShow > xSlideShow;
@@ -333,13 +333,13 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout
if( xSlideShow.is() && !nTimeout )
{
- xSlideShow->jumpToPageIndex( nPageIndexToRestart );
+ xSlideShow->jumpToPageIndex( 0 );
}
else if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() )
{
DeleteWindowFromPaintView();
mnPauseTimeout = nTimeout;
- mnRestartPageIndex = nPageIndexToRestart;
+ mnRestartPageIndex = 0;
meShowWindowMode = SHOWWINDOWMODE_PAUSE;
maShowBackground = Wallpaper( Color( COL_BLACK ) );
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index dafd0a5323cb..af2f01637f0d 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -54,7 +54,7 @@ public:
virtual void dispose() override;
void SetEndMode();
- bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr );
+ bool SetPauseMode( sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr );
bool SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor );
const Color& GetBlankColor() const { return maShowBackground.GetColor(); }
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index b154130c47b8..954bdd32dd78 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2947,10 +2947,10 @@ void SAL_CALL SlideshowImpl::gotoNextSlide( ) throw (RuntimeException, std::exc
if ( maPresSettings.mbShowPauseLogo )
{
Graphic aGraphic(SfxApplication::GetApplicationLogo(360));
- mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
+ mpShowWindow->SetPauseMode( maPresSettings.mnPauseTimeout, &aGraphic );
}
else
- mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout );
+ mpShowWindow->SetPauseMode( maPresSettings.mnPauseTimeout );
}
}
else