diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-19 13:38:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:46 +0200 |
| commit | 376d5a6ad979ef2b3e90c186ca8ede0ef2824200 (patch) | |
| tree | e504f14486204108d19270e1bd419294a292ce10 /framework/inc/dispatch/closedispatcher.hxx | |
| parent | 2f4c796c4db95a52b9478049e9872b92a93474b9 (diff) | |
convert more services in framework module to WeakImplHelper
Change-Id: I417ae2ce644f39fce0e8eb9fbe6a3a3c783b6227
Diffstat (limited to 'framework/inc/dispatch/closedispatcher.hxx')
| -rw-r--r-- | framework/inc/dispatch/closedispatcher.hxx | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 96ef71c6609a..af21194e2cd7 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase2.hxx> #include <vcl/evntpost.hxx> @@ -57,12 +57,11 @@ namespace framework{ or some other menu entries. Or we terminate the whole application in case this backing mode shouldnt be used. */ -class CloseDispatcher : public css::lang::XTypeProvider - , public css::frame::XNotifyingDispatch // => XDispatch - , public css::frame::XDispatchInformationProvider - // baseclasses ... order is necessary for right initialization! - , private ThreadHelpBase - , public ::cppu::OWeakObject +class CloseDispatcher : // baseclasses ... order is necessary for right initialization! + private ThreadHelpBase + , public ::cppu::WeakImplHelper2< + css::frame::XNotifyingDispatch, // => XDispatch + css::frame::XDispatchInformationProvider > { //------------------------------------------- // types @@ -156,10 +155,6 @@ class CloseDispatcher : public css::lang::XTypeProvider public: //--------------------------------------- - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - - //--------------------------------------- // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, |