diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-26 15:15:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-04-23 16:05:55 +0200 |
| commit | 1dec1f2f7efc579dedaec0535e3a750945039019 (patch) | |
| tree | 761ae4a0a92cbdbb952def9ad808e1ff7c9de516 /framework/inc | |
| parent | dbb4d4dd98c623c5c9309961ebb0548898b111e1 (diff) | |
fdo#46808, convert framework::AddonsToolBarWrapper to XComponentContext
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/addonstoolbarwrapper.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/uifactory/addonstoolboxfactory.hxx | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx index d73c67b6c741..34d80ae28929 100644 --- a/framework/inc/uielement/addonstoolbarwrapper.hxx +++ b/framework/inc/uielement/addonstoolbarwrapper.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace framework { @@ -33,7 +33,7 @@ class AddonsToolBarManager; class AddonsToolBarWrapper : public UIElementWrapperBase { public: - AddonsToolBarWrapper( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + AddonsToolBarWrapper( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); virtual ~AddonsToolBarWrapper(); // XComponent @@ -49,7 +49,7 @@ class AddonsToolBarWrapper : public UIElementWrapperBase // protected methods //------------------------------------------------------------------------------------------------------------- private: - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xToolBarManager; com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > m_aConfigData; }; diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx index 7f0c377494ff..920a4ed490fd 100644 --- a/framework/inc/uifactory/addonstoolboxfactory.hxx +++ b/framework/inc/uifactory/addonstoolboxfactory.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> @@ -48,7 +47,7 @@ class AddonsToolBoxFactory : protected ThreadHelpBase com::sun::star::ui::XUIElementFactory > { public: - AddonsToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + AddonsToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); virtual ~AddonsToolBoxFactory(); // XInterface, XTypeProvider, XServiceInfo @@ -61,7 +60,7 @@ class AddonsToolBoxFactory : protected ThreadHelpBase const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 > m_xModuleManager; }; |