diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/addonstoolbarmanager.hxx | 6 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 8 | ||||
-rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 18 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 27 |
4 files changed, 25 insertions, 34 deletions
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index bfaf87648137..561cfca25f0e 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -58,10 +58,10 @@ class AddonsToolBarManager : public ToolBarManager void FillToolbar( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& rAddonToolbar ); protected: - DECL_LINK(Click, void *); - DECL_LINK(DoubleClick, void *); + DECL_LINK_TYPED(Click, ToolBox *, void); + DECL_LINK_TYPED(DoubleClick, ToolBox *, void); DECL_LINK(Command, void *); - DECL_LINK(Select, void *); + DECL_LINK_TYPED(Select, ToolBox *, void); DECL_LINK(Activate, void *); DECL_LINK(Deactivate, void *); DECL_LINK( StateChanged, StateChangedType* ); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 11163fcb3d79..56db2819b72d 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -128,10 +128,10 @@ class ToolBarManager : public ToolbarManager_Base protected: DECL_LINK( Command, CommandEvent * ); PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar); - DECL_LINK(Click, void *); - DECL_LINK(DropdownClick, void *); - DECL_LINK(DoubleClick, void *); - DECL_LINK(Select, void *); + DECL_LINK_TYPED(Click, ToolBox *, void); + DECL_LINK_TYPED(DropdownClick, ToolBox *, void); + DECL_LINK_TYPED(DoubleClick, ToolBox *, void); + DECL_LINK_TYPED(Select, ToolBox *, void); DECL_LINK(Activate, void *); DECL_LINK(Deactivate, void *); DECL_LINK( StateChanged, StateChangedType* ); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 3c2c716a8c59..bc6a4b0b497c 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -381,10 +381,10 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue AddFrameActionListener(); } -IMPL_LINK_NOARG(AddonsToolBarManager, Click) +IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Click, ToolBox *, void) { if ( m_bDisposed ) - return 1; + return; sal_uInt16 nId( m_pToolBar->GetCurItemId() ); ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId ); @@ -395,14 +395,12 @@ IMPL_LINK_NOARG(AddonsToolBarManager, Click) if ( xController.is() ) xController->click(); } - - return 1; } -IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick) +IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void) { if ( m_bDisposed ) - return 1; + return; sal_uInt16 nId( m_pToolBar->GetCurItemId() ); ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId ); @@ -413,8 +411,6 @@ IMPL_LINK_NOARG(AddonsToolBarManager, DoubleClick) if ( xController.is() ) xController->doubleClick(); } - - return 1; } IMPL_LINK_NOARG(AddonsToolBarManager, Command) @@ -427,10 +423,10 @@ IMPL_LINK_NOARG(AddonsToolBarManager, Command) return 0; } -IMPL_LINK_NOARG(AddonsToolBarManager, Select) +IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void) { if ( m_bDisposed ) - return 1; + return; sal_Int16 nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() ); sal_uInt16 nId( m_pToolBar->GetCurItemId() ); @@ -442,8 +438,6 @@ IMPL_LINK_NOARG(AddonsToolBarManager, Select) if ( xController.is() ) xController->execute( nKeyModifier ); } - - return 1; } IMPL_LINK_NOARG(AddonsToolBarManager, Activate) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 7913c8d68845..75baaa504d90 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -277,12 +277,12 @@ void ToolBarManager::Destroy() m_pToolBar->doLazyDelete(); Link<> aEmpty; - m_pToolBar->SetSelectHdl( aEmpty ); + m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() ); m_pToolBar->SetActivateHdl( aEmpty ); m_pToolBar->SetDeactivateHdl( aEmpty ); - m_pToolBar->SetClickHdl( aEmpty ); - m_pToolBar->SetDropdownClickHdl( aEmpty ); - m_pToolBar->SetDoubleClickHdl( aEmpty ); + m_pToolBar->SetClickHdl( Link<ToolBox *, void>() ); + m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() ); + m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() ); m_pToolBar->SetStateChangedHdl( aEmpty ); m_pToolBar->SetDataChangedHdl( aEmpty ); m_pToolBar->SetCommandHdl( aEmpty ); @@ -1545,17 +1545,17 @@ long ToolBarManager::HandleClick(void ( SAL_CALL XToolbarController::*_pClick )( return 1; } -IMPL_LINK_NOARG(ToolBarManager, Click) +IMPL_LINK_NOARG_TYPED(ToolBarManager, Click, ToolBox *, void) { - return HandleClick(&XToolbarController::click); + HandleClick(&XToolbarController::click); } -IMPL_LINK_NOARG(ToolBarManager, DropdownClick) +IMPL_LINK_NOARG_TYPED(ToolBarManager, DropdownClick, ToolBox *, void) { SolarMutexGuard g; if ( m_bDisposed ) - return 1; + return; sal_uInt16 nId( m_pToolBar->GetCurItemId() ); ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId ); @@ -1570,12 +1570,11 @@ IMPL_LINK_NOARG(ToolBarManager, DropdownClick) xWin->setFocus(); } } - return 1; } -IMPL_LINK_NOARG(ToolBarManager, DoubleClick) +IMPL_LINK_NOARG_TYPED(ToolBarManager, DoubleClick, ToolBox *, void) { - return HandleClick(&XToolbarController::doubleClick); + HandleClick(&XToolbarController::doubleClick); } void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar ) @@ -2009,10 +2008,10 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) return 1; } -IMPL_LINK_NOARG(ToolBarManager, Select) +IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void) { if ( m_bDisposed ) - return 1; + return; sal_Int16 nKeyModifier( (sal_Int16)m_pToolBar->GetModifier() ); sal_uInt16 nId( m_pToolBar->GetCurItemId() ); @@ -2025,8 +2024,6 @@ IMPL_LINK_NOARG(ToolBarManager, Select) if ( xController.is() ) xController->execute( nKeyModifier ); } - - return 1; } IMPL_LINK_NOARG(ToolBarManager, Activate) |