diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-18 15:10:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-20 06:37:36 +0000 |
| commit | 99bfc363a6f6779d0be2284f85a9131254bce1f9 (patch) | |
| tree | 3da30adea892bae0f5e76031d8561e114c2da8d9 /extensions | |
| parent | convert Link<> to typed (diff) | |
| download | core-99bfc363a6f6779d0be2284f85a9131254bce1f9.tar.gz core-99bfc363a6f6779d0be2284f85a9131254bce1f9.zip | |
convert Link<> to typed
Change-Id: I10b050dc4aae45e646761a82520caa96969bc511
Reviewed-on: https://gerrit.libreoffice.org/18700
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index b046ab66512a..9416e74725db 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -135,7 +135,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper ResMgr* mpSfxResMgr; Idle maWaitIdle; Timer maTimeoutTimer; - Link<> maWindowEventHdl; + Link<VclWindowEvent&,void> maWindowEventHdl; Link<> maApplicationEventHdl; bool mbShowBubble; bool mbShowMenuIcon; @@ -148,7 +148,7 @@ private: DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void); DECL_LINK_TYPED(TimeOutHdl, Timer *, void); DECL_LINK_TYPED(UserEventHdl, void *, void); - DECL_LINK( WindowEventHdl, VclWindowEvent* ); + DECL_LINK_TYPED(WindowEventHdl, VclWindowEvent&, void); DECL_LINK( ApplicationEventHdl, VclSimpleEvent* ); BubbleWindow* GetBubbleWindow(); @@ -662,14 +662,14 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) } -IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) +IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) { - sal_uLong nEventID = pEvent->GetId(); + sal_uLong nEventID = rEvent.GetId(); if ( VCLEVENT_OBJECT_DYING == nEventID ) { SolarMutexGuard aGuard; - if ( mpIconSysWin == pEvent->GetWindow() ) + if ( mpIconSysWin == rEvent.GetWindow() ) { mpIconSysWin->RemoveEventListener( maWindowEventHdl ); RemoveBubbleWindow( true ); @@ -678,7 +678,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID ) { SolarMutexGuard aGuard; - vcl::Window *pWindow = pEvent->GetWindow(); + vcl::Window *pWindow = rEvent.GetWindow(); if ( pWindow ) { SystemWindow *pSysWin = pWindow->GetSystemWindow(); @@ -691,7 +691,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) else if ( VCLEVENT_WINDOW_MENUBARREMOVED == nEventID ) { SolarMutexGuard aGuard; - MenuBar *pMBar = static_cast<MenuBar*>(pEvent->GetData()); + MenuBar *pMBar = static_cast<MenuBar*>(rEvent.GetData()); if ( pMBar && ( pMBar == mpIconMBar ) ) RemoveBubbleWindow( true ); } @@ -699,7 +699,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) ( nEventID == VCLEVENT_WINDOW_RESIZE ) ) { SolarMutexGuard aGuard; - if ( ( mpIconSysWin == pEvent->GetWindow() ) && + if ( ( mpIconSysWin == rEvent.GetWindow() ) && mpBubbleWin && ( mpIconMBar != NULL ) ) { Rectangle aIconRect = mpIconMBar->GetMenuBarButtonRectPixel( mnIconID ); @@ -709,8 +709,6 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) mpBubbleWin->Show(); // This will recalc the screen position of the bubble } } - - return 0; } |