diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /sd/source/ui/slideshow | |
parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'sd/source/ui/slideshow')
-rw-r--r-- | sd/source/ui/slideshow/SlideShowRestarter.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/SlideShowRestarter.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/slideshow/showwindow.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 14 |
7 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index 4db7f62e7d57..2eec9f302522 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -77,7 +77,7 @@ void SlideShowRestarter::Restart (bool bForce) LINK(this, SlideShowRestarter, EndPresentation)); } -IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void) +IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation, void*, void) { mnEventId = nullptr; if (mpSlideShow.is()) diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 46a8563efea9..f25c9fcb98af 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -69,7 +69,7 @@ private: SfxDispatcher* mpDispatcher; sal_Int32 mnCurrentSlideNumber; - DECL_LINK_TYPED(EndPresentation, void*, void); + DECL_LINK(EndPresentation, void*, void); /** Restart the presentation on the slide last shown before the restart was initiated. diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 8b8f8c313167..ba757dc4b0a8 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -548,7 +548,7 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } -IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) +IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) { if( !( --mnPauseTimeout ) ) RestartShow(); @@ -559,7 +559,7 @@ IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) } } -IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl, Timer *, void) { if( mbMouseCursorHidden ) { @@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void) } } -IMPL_LINK_TYPED( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void ) { if( mbMouseAutoHide ) { diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 97c03da90271..229332e6a3c6 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -105,9 +105,9 @@ private: bool mbMouseCursorHidden; sal_uInt64 mnFirstMouseMove; - DECL_LINK_TYPED( PauseTimeoutHdl, Timer*, void ); - DECL_LINK_TYPED(MouseTimeoutHdl, Timer *, void); - DECL_LINK_TYPED( EventHdl, VclWindowEvent&, void ); + DECL_LINK( PauseTimeoutHdl, Timer*, void ); + DECL_LINK(MouseTimeoutHdl, Timer *, void); + DECL_LINK( EventHdl, VclWindowEvent&, void ); ::rtl::Reference< SlideshowImpl > mxController; }; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 7330d79b4fd7..700129f491a3 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1028,7 +1028,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback() mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) ); } -IMPL_LINK_NOARG_TYPED(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void) +IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void) { mnInPlaceConfigEvent = nullptr; StartInPlacePresentation(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c9f0adb6cc93..ebcb61eee36e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1385,7 +1385,7 @@ void SlideshowImpl::endPresentation() mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) ); } -IMPL_LINK_NOARG_TYPED(SlideshowImpl, endPresentationHdl, void*, void) +IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl, void*, void) { mnEndShowEvent = nullptr; @@ -1692,7 +1692,7 @@ void SlideshowImpl::startUpdateTimer() This is used to unfreeze user input that was disabled after slide change to skip input that was buffered during slide transition preparation */ -IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) +IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) { mbInputFreeze = false; } @@ -1701,7 +1701,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) and not by using the timer, I will personally punish this person seriously, even if this person is me. */ -IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void) +IMPL_LINK_NOARG(SlideshowImpl, updateHdl, Timer *, void) { updateSlideShow(); } @@ -1888,7 +1888,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) return bRet; } -IMPL_LINK_TYPED( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) +IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) { if( !mxShow.is() || mbInputFreeze ) return; @@ -1974,7 +1974,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt) } } -IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) +IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void) { mnContextMenuEvent = nullptr; @@ -2107,7 +2107,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void) resume(); } -IMPL_LINK_TYPED( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool ) +IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool ) { if( pMenu ) { @@ -2549,7 +2549,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio } } -IMPL_LINK_NOARG_TYPED(SlideshowImpl, deactivateHdl, Timer *, void) +IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl, Timer *, void) { if( mbActive && mxShow.is() ) { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index f990f8d96e7e..3234f9ad724f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -273,13 +273,13 @@ private: void setActiveXToolbarsVisible( bool bVisible ); - DECL_LINK_TYPED( updateHdl, Timer *, void ); - DECL_LINK_TYPED( ReadyForNextInputHdl, Timer *, void ); - DECL_LINK_TYPED( endPresentationHdl, void*, void ); - DECL_LINK_TYPED( ContextMenuSelectHdl, Menu *, bool ); - DECL_LINK_TYPED( ContextMenuHdl, void*, void ); - DECL_LINK_TYPED( deactivateHdl, Timer *, void ); - DECL_LINK_TYPED( EventListenerHdl, VclSimpleEvent&, void ); + DECL_LINK( updateHdl, Timer *, void ); + DECL_LINK( ReadyForNextInputHdl, Timer *, void ); + DECL_LINK( endPresentationHdl, void*, void ); + DECL_LINK( ContextMenuSelectHdl, Menu *, bool ); + DECL_LINK( ContextMenuHdl, void*, void ); + DECL_LINK( deactivateHdl, Timer *, void ); + DECL_LINK( EventListenerHdl, VclSimpleEvent&, void ); /** called only by the slideshow view when the first paint event occurs. This actually starts the slideshow. */ |