diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-03 20:57:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:54:51 +0200 |
| commit | b95427196e87e7bc1143674ef7cb9b1eeacb7f72 (patch) | |
| tree | f288318535f42f38eb9d19c11b0e160df97717ab /framework | |
| parent | 468e60717ff3de76051b2e6568ef101a16ca8721 (diff) | |
Use typed TabControl::SetDeactivatePageHdl Link
Change-Id: I487aad5217cb685ece971717445a68b4fb3d2b3a
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 | 4 | ||||
| -rw-r--r-- | framework/source/tabwin/tabwindow.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index 3e39087c2445..133782c22ef8 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -105,7 +105,7 @@ private: bool RemoveEntry( sal_Int32 nIndex ); DECL_DLLPRIVATE_LINK(ActivatePageHdl, void *); - DECL_DLLPRIVATE_LINK(DeactivatePageHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool); public: FwkTabWindow( vcl::Window* pParent ); diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 9edf5544f03d..e693ae20bb26 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -110,7 +110,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , protected: DECL_LINK( Activate, TabControl* ); - DECL_LINK( Deactivate, TabControl* ); + DECL_LINK_TYPED( Deactivate, TabControl*, bool ); private: diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 605b7b18b3cf..9e16a6fc3324 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -278,10 +278,10 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl) return 1; } -IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl) +IMPL_LINK_NOARG_TYPED(FwkTabWindow, DeactivatePageHdl, TabControl *, bool) { m_aTabCtrl->BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE ); - return 1; + return true; } void FwkTabWindow::AddEventListener( const Link<>& rEventListener ) diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 97263ecc7462..44c87bb48300 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -243,7 +243,7 @@ IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl ) return 1; } -IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) +IMPL_LINK_TYPED( TabWindow, Deactivate, TabControl*, pTabControl, bool ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ SolarMutexClearableGuard aLock; @@ -253,7 +253,7 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) implts_SendNotification( NOTIFY_DEACTIVATED, nPageId ); - return 1; + return true; } // XInitilization |