diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-06 12:05:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 06:56:57 +0000 |
| commit | 9af27324f5f5ef9bd340c6df8640b146a3eba21c (patch) | |
| tree | 1bab2dbd1185adf86714718f5fb1a757c1a101e9 /sfx2/source/menu | |
| parent | 67a5fbeb8e2d6775ff6bd7bfd35ff5027d38457c (diff) | |
convert Link<> to typed
Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2/source/menu')
| -rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 9fefbe5b2edd..a8460511ca13 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -206,7 +206,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) // executes the function for the selected item -IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) +IMPL_LINK_TYPED( SfxMenuManager, Select, Menu *, pSelMenu, bool ) { sal_uInt16 nId = (sal_uInt16) pSelMenu->GetCurItemId(); OUString aCommand = pSelMenu->GetItemCommand( nId ); @@ -235,7 +235,7 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) // special menu function pBindings->GetDispatcher_Impl()->Execute( nId ); - return sal_IntPtr(true); + return true; } SfxPopupMenuManager::~SfxPopupMenuManager() diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 6588f4961122..5bbda1cd4a3e 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -930,7 +930,7 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Deactivate, Menu *, pMenu, bool ) // called on activation of the SV-Menu -IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) +IMPL_LINK_TYPED( SfxVirtualMenu, Select, Menu *, pMenu, bool ) { sal_uInt16 nSlotId = (sal_uInt16) pMenu->GetCurItemId(); SAL_INFO( @@ -960,12 +960,12 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) nTaskId++; } - return sal_IntPtr(true); + return true; } else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST ) { SfxPickList::ExecuteMenuEntry( nSlotId ); - return sal_IntPtr(true); + return true; } OUString sCommand = pMenu->GetItemCommand(nSlotId); @@ -974,7 +974,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) else pBindings->Execute(nSlotId); - return sal_IntPtr(true); + return true; } |