From 8cf544cb3a71598dcf98e6563b51d2e334c720d3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 14 Aug 2015 16:34:39 +0200 Subject: convert Link<> to typed Change-Id: Ib0bf56a0e642720ff5daafdfc2dc12809be87e43 --- dbaccess/source/ui/app/AppController.cxx | 3 +-- dbaccess/source/ui/app/AppController.hxx | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 3 +-- dbaccess/source/ui/inc/brwctrlr.hxx | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index a21e6f7bfa5d..d6f67c3b02ee 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2246,10 +2246,9 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const OUStr } } -IMPL_LINK_NOARG(OApplicationController, OnClipboardChanged) +IMPL_LINK_NOARG_TYPED(OApplicationController, OnClipboardChanged, TransferableDataHelper*, void) { OnInvalidateClipboard(); - return 0L; } void OApplicationController::OnInvalidateClipboard() diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index ada71a0b3b40..fda9a6a5576e 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -524,7 +524,7 @@ namespace dbaui getCurrentSelection( Control& _rControl ) const SAL_OVERRIDE; void OnInvalidateClipboard(); - DECL_LINK( OnClipboardChanged, void* ); + DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); DECL_LINK( OnAsyncDrop, void* ); DECL_LINK( OnCreateWithPilot, void* ); DECL_LINK( OnSelectContainer, void* ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 1f05479f4727..cc3b1c3ade8a 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2278,11 +2278,10 @@ void SbaXDataBrowserController::CellDeactivated() OnInvalidateClipboard( NULL ); } -IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged) +IMPL_LINK_NOARG_TYPED(SbaXDataBrowserController, OnClipboardChanged, TransferableDataHelper*, void) { SolarMutexGuard aGuard; OnInvalidateClipboard( NULL ); - return 0; } IMPL_LINK_TYPED(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 7c1dfef21e6a..2b1d027952c8 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -328,7 +328,7 @@ namespace dbaui // time to check the CUT/COPY/PASTE-slot-states DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); - DECL_LINK( OnClipboardChanged, void* ); + DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); // search callbacks DECL_LINK(OnSearchContextRequest, FmSearchContext*); -- cgit