summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r--sd/source/ui/slideshow/showwin.cxx4
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx3
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx8
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx4
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.cxx3
-rw-r--r--sd/source/ui/slideshow/slideshowviewimpl.hxx2
7 files changed, 10 insertions, 16 deletions
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index feeff3ac1471..ecbebd0bb363 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -305,7 +305,7 @@ void ShowWindow::Move()
::sd::Window::Move();
}
-bool ShowWindow::SetEndMode()
+void ShowWindow::SetEndMode()
{
if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() )
{
@@ -322,8 +322,6 @@ bool ShowWindow::SetEndMode()
Invalidate();
}
-
- return( SHOWWINDOWMODE_END == meShowWindowMode );
}
bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo )
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index af9a9ea1a655..dafd0a5323cb 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -53,7 +53,7 @@ public:
virtual ~ShowWindow();
virtual void dispose() override;
- bool SetEndMode();
+ void SetEndMode();
bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr );
bool SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor );
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index e2b737efedfe..aa46aab44740 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1021,7 +1021,7 @@ bool SlideShow::isAlwaysOnTop()
return mxController.is() && mxController->maPresSettings.mbAlwaysOnTop;
}
-bool SlideShow::pause( bool bPause )
+void SlideShow::pause( bool bPause )
{
if( mxController.is() )
{
@@ -1030,7 +1030,6 @@ bool SlideShow::pause( bool bPause )
else
mxController->resume();
}
- return true;
}
void SlideShow::receiveRequest(SfxRequest& rReq)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 07287a08e996..8976c21bf393 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1739,10 +1739,9 @@ sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::excep
return maPresSettings.mbEndless;
}
-double SlideshowImpl::update()
+void SlideshowImpl::update()
{
startUpdateTimer();
- return -1;
}
void SlideshowImpl::startUpdateTimer()
@@ -1770,14 +1769,14 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void)
updateSlideShow();
}
-sal_Int32 SlideshowImpl::updateSlideShow()
+void SlideshowImpl::updateSlideShow()
{
// prevent me from deletion when recursing (App::EnableYieldMode does)
const rtl::Reference<SlideshowImpl> this_(this);
Reference< XSlideShow > xShow( mxShow );
if ( ! xShow.is())
- return 0;
+ return;
try
{
@@ -1819,7 +1818,6 @@ sal_Int32 SlideshowImpl::updateSlideShow()
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
}
- return 0;
}
bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 09006a895054..88666d414243 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -252,7 +252,7 @@ private:
/** forces an async call to update in the main thread */
void startUpdateTimer();
- double update();
+ void update();
void createSlideList( bool bAll, const OUString& rPresSlide );
@@ -315,7 +315,7 @@ private:
its return value, wait for a certain amount of time before another
call to update() is scheduled.
*/
- sal_Int32 updateSlideShow();
+ void updateSlideShow();
css::uno::Reference< css::presentation::XSlideShow > mxShow;
rtl::Reference<sd::SlideShowView> mxView;
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index fd38e6272966..76d8dc9e9040 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -73,7 +73,7 @@ void SlideShowViewListeners::removeListener( const Reference< util::XModifyListe
maListeners.erase( aIter );
}
-bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception )
+void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception )
{
::osl::MutexGuard aGuard( mrMutex );
@@ -91,7 +91,6 @@ bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( c
aIter = maListeners.erase( aIter );
}
}
- return true;
}
void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource )
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 458ee823476d..369017a0b380 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -105,7 +105,7 @@ public:
void addListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener );
void removeListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener );
- bool notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception );
+ void notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception );
void disposing( const css::lang::EventObject& _rEventSource );
protected: