diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-25 16:09:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-04 14:22:34 +0200 |
| commit | dc00ad1e823e3b36619cd04c7e4d169362e199b3 (patch) | |
| tree | 5650e5891532dde51346d8bf5e7703569712f025 /framework/inc | |
| parent | 244c7cdede13980c29850b7b68e9da16cdc61879 (diff) | |
fdo#46808, Use service constructor for task::InteractionHandler
a lot of code was loading the service using it's implementation name,
which is why this got missed earlier.
Change-Id: I0b150bc9383a1a3a09ab905c4ddb7f914e69638d
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/framework/preventduplicateinteraction.hxx | 5 | ||||
| -rw-r--r-- | framework/inc/services.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index 559f6b4a7495..2d058c231777 100644 --- a/framework/inc/framework/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase1.hxx> @@ -92,7 +91,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 private: /// Used to create needed uno services at runtime. - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; + css::uno::Reference< css::uno::XComponentContext > m_xContext; /** The outside interaction handler, which is used to handle every incoming interaction, if it's not blocked. */ @@ -160,7 +159,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @threadsafe not neccessary */ - PreventDuplicateInteraction(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + PreventDuplicateInteraction(const css::uno::Reference< css::uno::XComponentContext >& rxContext); //_________________________________ /** diff --git a/framework/inc/services.h b/framework/inc/services.h index 28f8b6d70bad..6fb4b45c723e 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -77,7 +77,6 @@ namespace framework{ #define IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.comp.framework.DispatchRecorderSupplier") #define IMPLEMENTATIONNAME_MAILTODISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.MailToDispatcher" ) #define IMPLEMENTATIONNAME_SERVICEHANDLER DECLARE_ASCII("com.sun.star.comp.framework.ServiceHandler" ) -#define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER DECLARE_ASCII("com.sun.star.comp.uui.UUIInteractionHandler" ) #define IMPLEMENTATIONNAME_SUBSTITUTEPATHVARIABLES DECLARE_ASCII("com.sun.star.comp.framework.PathSubstitution" ) #define IMPLEMENTATIONNAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.comp.framework.PathSettings" ) #define IMPLEMENTATIONNAME_JOBDISPATCH DECLARE_ASCII("com.sun.star.comp.framework.jobs.JobDispatch" ) |