From 6d8124e30c6ce38219ca323f9674f242c822c360 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Sep 2015 08:55:52 +0200 Subject: convert Link<> to typed and remove unused UserEvent class Change-Id: Ic61c5eef75c36393dbbaa92d93163eab89021ee3 --- svtools/source/misc/acceleratorexecute.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'svtools') diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index f8c67f3db5bb..f5aacd0ee334 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -67,7 +67,7 @@ class SVT_DLLPRIVATE AsyncAccelExec SVT_DLLPRIVATE AsyncAccelExec(const css::uno::Reference< css::frame::XDispatch >& xDispatch, const css::util::URL& aURL ); - DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); + DECL_DLLPRIVATE_LINK_TYPED(impl_ts_asyncCallback, LinkParamNone*, void); private: vcl::EventPoster m_aAsyncCallback; @@ -425,10 +425,9 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge } -IMPL_LINK_NOARG(AcceleratorExecute, impl_ts_asyncCallback) +IMPL_LINK_NOARG_TYPED(AcceleratorExecute, impl_ts_asyncCallback, LinkParamNone*, void) { // replaced by AsyncAccelExec! - return 0; } @@ -451,14 +450,14 @@ AsyncAccelExec* AsyncAccelExec::createOnShotInstance(const css::uno::Reference< void AsyncAccelExec::execAsync() { - m_aAsyncCallback.Post(0); + m_aAsyncCallback.Post(); } -IMPL_LINK_NOARG(AsyncAccelExec, impl_ts_asyncCallback) +IMPL_LINK_NOARG_TYPED(AsyncAccelExec, impl_ts_asyncCallback, LinkParamNone*, void) { if (! m_xDispatch.is()) - return 0; + return; try { @@ -472,8 +471,6 @@ IMPL_LINK_NOARG(AsyncAccelExec, impl_ts_asyncCallback) {} delete this; - - return 0; } } // namespace svt -- cgit