diff options
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/dispatch/startmoduledispatcher.hxx | 9 | ||||
| -rw-r--r-- | framework/inc/services.h | 1 | ||||
| -rw-r--r-- | framework/inc/services/backingcomp.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 373c333eccbb..9518b45b4150 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <cppuhelper/weak.hxx> @@ -64,7 +65,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider /** @short reference to an uno service manager, which can be used to create own needed uno resources. */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; + css::uno::Reference< css::uno::XComponentContext > m_xContext; //--------------------------------------- /** @short our "context" frame. */ @@ -88,8 +89,8 @@ class StartModuleDispatcher : public css::lang::XTypeProvider @descr Such "owner frame" is used as context for all related operations. - @param xSMGR - an uno service manager, which is needed to create uno resource + @param xContext + an UNO service manager, which is needed to create UNO resource internaly. @param xFrame @@ -98,7 +99,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider @param sTarget the original target information used for the related queryDispatch() call. */ - StartModuleDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , + StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame , const ::rtl::OUString& sTarget); diff --git a/framework/inc/services.h b/framework/inc/services.h index f15cb46151ad..3e95ffd09d22 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -46,7 +46,6 @@ namespace framework{ #define SERVICENAME_UICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.UIConfigurationManager" ) #define SERVICENAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.ModuleUIConfigurationManager" ) #define SERVICENAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.ui.UIElementFactory" ) -#define SERVICENAME_STARTMODULE DECLARE_ASCII("com.sun.star.frame.StartModule" ) #define SERVICENAME_FRAMECONTROLLER DECLARE_ASCII("com.sun.star.frame.Controller" ) #define SERVICENAME_MODULEACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.ModuleAcceleratorConfiguration") #define SERVICENAME_DOCUMENTACCELERATORCONFIGURATION DECLARE_ASCII("com.sun.star.ui.DocumentAcceleratorConfiguration") diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index f54ef495fd03..bf1dd84533e3 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -63,7 +63,7 @@ class BackingComp : public css::lang::XTypeProvider , public css::lang::XInitialization , public css::frame::XController // => XComponent , public css::awt::XKeyListener // => XEventListener - // attention! Must be the first base class to guarentee right initialize lock ... + // attention! Must be the first base class to guarantee right initialize lock ... , private ThreadHelpBase , public ::cppu::OWeakObject { |