diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-21 08:03:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-21 08:03:52 +0200 |
commit | 1e67e94f1a308ca60d4934e9fe9d5c048225ebe8 (patch) | |
tree | c3bdf0fcec6912bc84e835fe48a80ee9f9391106 /extensions/source | |
parent | c916152d8562cab868d4c522748ac30029fad179 (diff) |
convert Link<> to typed
Change-Id: If3e2b00092440ebd42ae5b73ae2b0e44c3702683
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/bibliography/toolbar.cxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/toolbar.hxx | 2 | ||||
-rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 11 |
3 files changed, 7 insertions, 10 deletions
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index e60e3f7f2a33..a6f731658059 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -555,7 +555,7 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) -IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl ) +IMPL_LINK_NOARG_TYPED( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) { // Check if toolbar button size have changed and we have to use system settings sal_Int16 eSymbolsSize = SvtMiscOptions().GetCurrentSymbolsSize(); @@ -564,8 +564,6 @@ IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl ) nSymbolsSize = eSymbolsSize; RebuildToolbar(); } - - return 0L; } diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 341344e5e4c5..5d8b514092d0 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -132,7 +132,7 @@ class BibToolBar: public ToolBox DECL_LINK_TYPED( SendSelHdl, Idle*, void ); DECL_LINK_TYPED( MenuHdl, ToolBox*, void ); DECL_LINK_TYPED( OptionsChanged_Impl, LinkParamNone*, void ); - DECL_LINK( SettingsChanged_Impl, void* ); + DECL_LINK_TYPED( SettingsChanged_Impl, VclSimpleEvent&, void ); void ApplyImageList(); void RebuildToolbar(); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 9416e74725db..f9167e17c01c 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -136,7 +136,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper Idle maWaitIdle; Timer maTimeoutTimer; Link<VclWindowEvent&,void> maWindowEventHdl; - Link<> maApplicationEventHdl; + Link<VclSimpleEvent&,void> maApplicationEventHdl; bool mbShowBubble; bool mbShowMenuIcon; bool mbBubbleChanged; @@ -149,7 +149,7 @@ private: DECL_LINK_TYPED(TimeOutHdl, Timer *, void); DECL_LINK_TYPED(UserEventHdl, void *, void); DECL_LINK_TYPED(WindowEventHdl, VclWindowEvent&, void); - DECL_LINK( ApplicationEventHdl, VclSimpleEvent* ); + DECL_LINK_TYPED(ApplicationEventHdl, VclSimpleEvent&, void); BubbleWindow* GetBubbleWindow(); void RemoveBubbleWindow( bool bRemoveIcon ); @@ -712,16 +712,16 @@ IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) } -IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) +IMPL_LINK_TYPED( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) { - switch (pEvent->GetId()) + switch (rEvent.GetId()) { case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_ACTIVATE: case VCLEVENT_WINDOW_GETFOCUS: { SolarMutexGuard aGuard; - vcl::Window *pWindow = static_cast< VclWindowEvent * >(pEvent)->GetWindow(); + vcl::Window *pWindow = static_cast< VclWindowEvent * >(&rEvent)->GetWindow(); if ( pWindow && pWindow->IsTopWindow() ) { SystemWindow *pSysWin = pWindow->GetSystemWindow(); @@ -734,7 +734,6 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) break; } } - return 0; } |