diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-22 11:08:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-22 15:20:12 +0200 |
commit | a726677724a5a8dd6ae39d5a7a829c2ed62f3efd (patch) | |
tree | ed6de2b6c3130d2464602248efd3344ce133531a /framework | |
parent | fe1ac1bf904ec7905187c3c3a5fe6a90f31f94e7 (diff) |
fdo#46808, Convert XMultiServiceFactory to XComponentContext
Change-Id: Ib5e6fb4d6a4ff8f2bd315f19bde5028be2c569ea
Diffstat (limited to 'framework')
7 files changed, 14 insertions, 14 deletions
diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx index bc4a71d63112..59548a26c63b 100644 --- a/framework/inc/uielement/genericstatusbarcontroller.hxx +++ b/framework/inc/uielement/genericstatusbarcontroller.hxx @@ -30,7 +30,7 @@ struct AddonStatusbarItemData; class GenericStatusbarController : public svt::StatusbarController { public: - GenericStatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + GenericStatusbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const com::sun::star::uno::Reference< com::sun::star::ui::XStatusbarItem >& rxItem, AddonStatusbarItemData *pItemData ); diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx index 71896ef18a4b..0f7a77d888a7 100644 --- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx +++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx @@ -42,7 +42,7 @@ namespace framework { class LangSelectionStatusbarController : public svt::StatusbarController { public: - explicit LangSelectionStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + explicit LangSelectionStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); // XServiceInfo DECLARE_XSERVICEINFO diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 0bde95d0ccae..6723b950cc72 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 4b4d721e1621..4140ab8b696e 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -43,11 +43,11 @@ namespace framework { GenericStatusbarController::GenericStatusbarController( - const Reference< XMultiServiceFactory >& rxServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxFrame, const Reference< ui::XStatusbarItem >& rxItem, AddonStatusbarItemData *pItemData ) - : svt::StatusbarController( rxServiceManager, rxFrame, OUString(), 0 ) + : svt::StatusbarController( rxContext, rxFrame, OUString(), 0 ) , m_bEnabled( sal_False ) , m_bOwnerDraw( sal_False ) , m_pItemData( pItemData ) diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 09c0a3d02dae..8773c819bb0f 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -44,8 +44,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/util/URLTransformer.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -75,7 +73,7 @@ using ::rtl::OUStringBuffer; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController , +DEFINE_XSERVICEINFO_MULTISERVICE_2 ( LangSelectionStatusbarController , OWeakObject , SERVICENAME_STATUSBARCONTROLLER , IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER @@ -83,11 +81,11 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController DEFINE_INIT_SERVICE ( LangSelectionStatusbarController, {} ) -LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), OUString(), 0 ), +LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< uno::XComponentContext >& xContext ) : + svt::StatusbarController( xContext, uno::Reference< frame::XFrame >(), OUString(), 0 ), m_bShowMenu( sal_True ), m_nScriptType( LS_SCRIPT_LATIN | LS_SCRIPT_ASIAN | LS_SCRIPT_COMPLEX ), - m_aLangGuessHelper( comphelper::getComponentContext(xServiceManager) ) + m_aLangGuessHelper( xContext ) { } @@ -114,9 +112,9 @@ throw (::com::sun::star::uno::RuntimeException) return; //add context menu - Reference< awt::XPopupMenu > xPopupMenu( awt::PopupMenu::create( comphelper::getComponentContext(m_xServiceManager) ) ); + Reference< awt::XPopupMenu > xPopupMenu( awt::PopupMenu::create( m_xContext ) ); //sub menu that contains all items except the last two items: Separator + Set Language for Paragraph - Reference< awt::XPopupMenu > subPopupMenu( awt::PopupMenu::create( comphelper::getComponentContext(m_xServiceManager) ) ); + Reference< awt::XPopupMenu > subPopupMenu( awt::PopupMenu::create( m_xContext ) ); SvtLanguageTable aLanguageTable; diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index b6ba2462350a..2b096a52ab88 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -421,7 +421,7 @@ void StatusBarManager::CreateControllers() // 3º) Is Add-on? Generic statusbar controller if ( pItemData ) { - pController = new GenericStatusbarController( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), + pController = new GenericStatusbarController( m_xContext, m_xFrame, xStatusbarItem, pItemData ); @@ -429,7 +429,7 @@ void StatusBarManager::CreateControllers() else { // 4º) Default Statusbar controller - pController = new svt::StatusbarController( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), m_xFrame, aCommandURL, nId ); + pController = new svt::StatusbarController( m_xContext, m_xFrame, aCommandURL, nId ); } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index fdbb17ba8634..2ddcda576c88 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/ToolbarControllerFactory.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> |