diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-02 09:20:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 07:20:27 +0000 |
| commit | 5beffcf3f1fd96fb9909b93759f8537417048863 (patch) | |
| tree | 4c3818fa030c9b5f99a7abd3a39b68945a0c41e3 /framework | |
| parent | 84945163ab6496d22ca814880cfd14ceb33c5f14 (diff) | |
convert Link<> to typed
Change-Id: Ic0482dc5ed26eb2fc6ccde73022eff8b4786de83
Reviewed-on: https://gerrit.libreoffice.org/18258
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/fwktabwindow.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/tabwin/tabwindow.hxx | 2 | ||||
| -rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 3 | ||||
| -rw-r--r-- | framework/source/tabwin/tabwindow.cxx | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index 133782c22ef8..92976b8f304e 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -104,7 +104,7 @@ private: TabEntry* FindEntry( sal_Int32 nIndex ) const; bool RemoveEntry( sal_Int32 nIndex ); - DECL_DLLPRIVATE_LINK(ActivatePageHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl *, void); DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool); public: diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 9bdc6a827b21..ef01faaa1783 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -109,7 +109,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - DECL_LINK( Activate, TabControl* ); + DECL_LINK_TYPED( Activate, TabControl*, void ); DECL_LINK_TYPED( Deactivate, TabControl*, bool ); private: diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index e6cc7e3a03df..b74c8203371c 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -256,7 +256,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const return pEntry; } -IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) +IMPL_LINK_NOARG_TYPED(FwkTabWindow, ActivatePageHdl, TabControl*, void) { const sal_uInt16 nId = m_aTabCtrl->GetCurPageId(); FwkTabPage* pTabPage = static_cast< FwkTabPage* >( m_aTabCtrl->GetTabPage( nId ) ); @@ -275,7 +275,6 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) pTabPage->ActivatePage(); } m_aTabCtrl->BroadcastEvent( VCLEVENT_TABPAGE_ACTIVATE ); - return 1; } IMPL_LINK_NOARG_TYPED(FwkTabWindow, DeactivatePageHdl, TabControl *, bool) diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 245de85a1485..fedbd743227a 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -226,7 +226,7 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con // Links -IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl ) +IMPL_LINK_TYPED( TabWindow, Activate, TabControl*, pTabControl, void ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ SolarMutexClearableGuard aLock; @@ -239,8 +239,6 @@ IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl ) /* SAFE AREA ----------------------------------------------------------------------------------------------- */ implts_SendNotification( NOTIFY_ACTIVATED, nPageId ); - - return 1; } IMPL_LINK_TYPED( TabWindow, Deactivate, TabControl*, pTabControl, bool ) |