diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-27 13:08:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-28 09:49:56 +0200 |
| commit | bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch) | |
| tree | f05be9665737f0667faf95702d96fbf3f0a103c5 /toolkit | |
| parent | 1b9c3a17e8496aedfb80528c5275e6658154789d (diff) | |
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/asynccallback.cxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index 391cccf6e782..cc988b2b0831 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -61,7 +61,7 @@ private: css::uno::Any aData; }; - DECL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData* ); + DECL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, void ); virtual ~AsyncCallback() {} }; @@ -97,8 +97,9 @@ void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XC } // private asynchronous link to call reference to the callback object -IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData*, pCallbackData ) +IMPL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, p, void ) { + CallbackData* pCallbackData = static_cast<CallbackData*>(p); try { // Asynchronous execution @@ -111,7 +112,6 @@ IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, CallbackData*, pCallbackData ) } delete pCallbackData; - return 0; } } // closing anonymous implementation namespace diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 01c9d65e190f..32943402e3b7 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -188,7 +188,7 @@ public: ~VCLXWindowImpl(); private: - DECL_LINK( OnProcessCallbacks, void* ); + DECL_LINK_TYPED( OnProcessCallbacks, void*, void ); }; @@ -271,7 +271,7 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback ) } -IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) +IMPL_LINK_NOARG_TYPED(VCLXWindowImpl, OnProcessCallbacks, void*, void) { const Reference< uno::XInterface > xKeepAlive( mrAntiImpl ); @@ -287,7 +287,7 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) if ( !mnCallbackEventId ) // we were disposed while waiting for the mutex to lock - return 1L; + return; mnCallbackEventId = 0; } @@ -302,8 +302,6 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) (*loop)(); } } - - return 0L; } Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() |