diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-28 10:49:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-03 09:59:59 +0200 |
| commit | a8a35e54f506ae22a0ac8f80aa824813260de000 (patch) | |
| tree | a4b9e98346c9c579536557f0256abb08908fa5e8 /framework | |
| parent | 515701a1ff18d04ede235bef862c465adf41062f (diff) | |
fdo#46808, Convert frame::AppDispatchProvider to new style
The service already existed, it just needed an IDL file.
Change-Id: I9553c8e7c4922f2106bc13034e0cc35669b28b7e
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services.h | 1 | ||||
| -rw-r--r-- | framework/source/dispatch/dispatchinformationprovider.cxx | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h index 8a761e0b5f9d..24503d4041ee 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -99,7 +99,6 @@ namespace framework{ #define IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.RecentFilesMenuController" ) #define IMPLEMENTATIONNAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.StatusBarFactory" ) #define IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.StatusBarControllerFactory" ) -#define IMPLEMENTATIONNAME_APPDISPATCHPROVIDER DECLARE_ASCII("com.sun.star.comp.sfx2.AppDispatchProvider" ) #define IMPLEMENTATIONNAME_SESSIONLISTENER DECLARE_ASCII("com.sun.star.comp.frame.SessionListener" ) #define IMPLEMENTATIONNAME_HELPONSTARTUP DECLARE_ASCII("com.sun.star.comp.framework.HelpOnStartup" ) #define IMPLEMENTATIONNAME_SHELLJOB DECLARE_ASCII("com.sun.star.comp.framework.ShellJob" ) diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index eb0e1288f28e..936a9139a416 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -25,6 +25,8 @@ #include <services.h> #include <com/sun/star/frame/CommandGroup.hpp> +#include <com/sun/star/frame/AppDispatchProvider.hpp> + #include <comphelper/sequenceasvector.hxx> @@ -148,8 +150,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvide css::uno::Reference< css::frame::XDispatchInformationProvider > xCloseDispatch(xCloser , css::uno::UNO_QUERY); css::uno::Reference< css::frame::XDispatchInformationProvider > xController (xFrame->getController() , css::uno::UNO_QUERY); - css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher( - xContext->getServiceManager()->createInstanceWithContext(IMPLEMENTATIONNAME_APPDISPATCHPROVIDER, xContext), css::uno::UNO_QUERY); + css::uno::Reference< css::frame::XDispatchInformationProvider > xAppDispatcher = css::frame::AppDispatchProvider::create(xContext); css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider(3); lProvider[0] = xController ; lProvider[1] = xCloseDispatch; |