summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow/slideshowimpl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.cxx')
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index bf369a235420..59cae0341c12 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1424,13 +1424,12 @@ void SlideshowImpl::endPresentation()
mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) );
}
-IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, endPresentationHdl, void*, void)
{
mnEndShowEvent = 0;
if( mxPresentation.is() )
mxPresentation->end();
- return 0;
}
void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
@@ -2092,12 +2091,12 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt)
}
}
-IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void)
{
mnContextMenuEvent = 0;
if( mpSlideController.get() == 0 )
- return 0;
+ return;
mbWasPaused = mbIsPaused;
if( !mbWasPaused )
@@ -2223,7 +2222,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl)
if( !mbWasPaused )
resume();
- return 0;
}
IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )