diff options
| -rw-r--r-- | include/svtools/acceleratorexecute.hxx | 28 | ||||
| -rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 10 |
2 files changed, 1 insertions, 37 deletions
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 975b44def6f9..a4ef5d568b32 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -71,16 +71,6 @@ struct TMutexInit */ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit { - - // const, types - private: - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; - - // member private: @@ -97,18 +87,6 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - TCommandQueue m_lCommandQueue; - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - vcl::EventPoster m_aAsyncCallback; - - // interface public: @@ -227,12 +205,6 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit /** TODO document me */ SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - DECL_DLLPRIVATE_LINK_TYPED(impl_ts_asyncCallback, LinkParamNone*, void); }; } // namespace svt diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index a4e1ee5a082c..0e77360e77bc 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -83,8 +83,7 @@ class SVT_DLLPRIVATE AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEv AcceleratorExecute::AcceleratorExecute() - : TMutexInit ( ) - , m_aAsyncCallback(LINK(this, AcceleratorExecute, impl_ts_asyncCallback)) + : TMutexInit() { } @@ -431,13 +430,6 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge return xParser; } - -IMPL_LINK_NOARG_TYPED(AcceleratorExecute, impl_ts_asyncCallback, LinkParamNone*, void) -{ - // replaced by AsyncAccelExec! -} - - AsyncAccelExec::AsyncAccelExec(const css::uno::Reference<css::lang::XComponent>& xFrame, const css::uno::Reference<css::frame::XDispatch>& xDispatch, const css::util::URL& rURL) |