diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-20 17:22:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-21 07:44:43 +0000 |
| commit | 382eb1a23c390154619c385414bdbe6f6e461173 (patch) | |
| tree | dbd1970c3d36903b78ed4c754f5faf14f57755c7 /embeddedobj | |
| parent | 652933e8fe46b24049ad0a6e61811727b1965aea (diff) | |
remove untyped Link<>
Change-Id: I809f9e10309ceadda0a82c3818277323b34ec61b
Reviewed-on: https://gerrit.libreoffice.org/19491
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/test/MainThreadExecutor/xexecutor.cxx | 4 | ||||
| -rw-r--r-- | embeddedobj/test/mtexecutor/mainthreadexecutor.cxx | 3 | ||||
| -rw-r--r-- | embeddedobj/test/mtexecutor/mainthreadexecutor.hxx | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx index 24fd827bf1c7..2164f76516b5 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx @@ -29,7 +29,7 @@ void MainThreadExecutor_Impl::execute() Application::PostUserEvent( LINK( this, MainThreadExecutor_Impl, executor ), NULL ); } -IMPL_LINK_NOARG( MainThreadExecutor_Impl, executor ) +IMPL_LINK_NOARG_TYPED( MainThreadExecutor_Impl, executor, void*, void ) { if ( m_xJob.is() ) { @@ -40,8 +40,6 @@ IMPL_LINK_NOARG( MainThreadExecutor_Impl, executor ) m_bExecuted = sal_True; delete this; - - return 0; } MainThreadExecutor_Impl::MainThreadExecutor_Impl( const uno::Reference< task::XJob >& xJob, diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx index 09760748a039..45f650d0dc42 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx @@ -77,12 +77,11 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named } -IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest ) +IMPL_STATIC_LINK_TYPED( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest, void ) { pThreadExecutorRequest->doIt(); delete pThreadExecutorRequest; - return 0; } diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx index 4eecd48cb058..095f983e2aaa 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx @@ -59,7 +59,7 @@ public: static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); - DECL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest* ); + DECL_STATIC_LINK_TYPED( MainThreadExecutor, worker, MainThreadExecutorRequest*, void ); // XJob virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException); |