From 02fd846d2350fd57b0270cd85e475784d9cfa8fd Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 17 Sep 2015 08:41:29 +0200 Subject: convert Link<> to typed Change-Id: I6c0898db47b39648bb143ad040864c0279269f96 --- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 ++-- dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 +- dbaccess/source/ui/inc/dbtreelistbox.hxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index b45ea63de059..c3e68284d7f6 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -904,9 +904,9 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r } } -IMPL_LINK(OAppDetailPageHelper, OnEntryEnterKey, void*, _pTree) +IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, void ) { - return OnEntryDoubleClick(static_cast(_pTree)) ? 0 : 1; + OnEntryDoubleClick(_pTree); } IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index ad26c24c07f2..1666f163d3ec 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -152,7 +152,7 @@ namespace dbaui DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage); DECL_LINK_TYPED( OnEntryDoubleClick, SvTreeListBox*, bool ); - DECL_LINK( OnEntryEnterKey, void* ); + DECL_LINK_TYPED( OnEntryEnterKey, DBTreeListBox*, void ); DECL_LINK_TYPED( OnEntrySelChange, LinkParamNone*, void ); DECL_LINK_TYPED( OnCutEntry, LinkParamNone*, void ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 61997c26816e..9e6c42b3aedc 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -66,7 +66,7 @@ namespace dbaui Link m_aCopyHandler; // called when someone press CTRL+C Link m_aPasteHandler; // called when someone press CTRL+V Link m_aDeleteHandler; // called when someone press DELETE Key - Link<> m_aEnterKeyHdl; + Link m_aEnterKeyHdl; bool m_bHandleEnterKey; @@ -117,7 +117,7 @@ namespace dbaui virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; - void SetEnterKeyHdl(const Link<>& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} + void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} void clearCurrentSelection() { m_aSelectedEntries.clear(); } -- cgit