diff options
| author | Noel Grandin <noel@peralex.com> | 2012-08-23 17:46:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-03 15:55:03 +0200 |
| commit | 10362695c2060f6aa48bd88f6b8dd6cfa556392a (patch) | |
| tree | 47934dee52011b102f3dec35eda5888240920e68 /cui | |
| parent | a297372210396260da57f34da3790f76682603cc (diff) | |
fdo#46808, Adapt ModuleUIConfigurationManagerSupplier UNO service to new style
Change-Id: I58b17349474b974edd24aa17ec08ffa848a92ae9
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 7 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index a9c5da44d742..eafc26afacd8 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -54,7 +54,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/form/XReset.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -67,6 +67,7 @@ //----------------------------------------------- // include other projects +#include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <svtools/acceleratorexecute.hxx> #include <svtools/svlbitm.hxx> @@ -93,7 +94,6 @@ static ::rtl::OUString SERVICE_UICONFIGMGR (RTL_CONSTASCII_USTRINGP static ::rtl::OUString SERVICE_DESKTOP (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop" )); static ::rtl::OUString SERVICE_MODULEMANAGER (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager" )); static ::rtl::OUString SERVICE_GLOBALACCCFG (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.GlobalAcceleratorConfiguration" )); -static ::rtl::OUString SERVICE_MODULEUICONFIGSUPPLIER (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")); static ::rtl::OUString SERVICE_UICMDDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.UICommandDescription" )); static ::rtl::OUString MODULEPROP_SHORTNAME (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryShortName" )); @@ -877,7 +877,8 @@ void SfxAcceleratorConfigPage::InitAccCfg() m_xGlobal = css::uno::Reference< css::ui::XAcceleratorConfiguration >(m_xSMGR->createInstance(SERVICE_GLOBALACCCFG), css::uno::UNO_QUERY_THROW); // get module accelerator configuration - css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(m_xSMGR->createInstance(SERVICE_MODULEUICONFIGSUPPLIER), css::uno::UNO_QUERY_THROW); + + css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(css::ui::ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(m_xSMGR).getUNOContext())); css::uno::Reference< css::ui::XUIConfigurationManager > xUICfgManager = xModuleCfgSupplier->getUIConfigurationManager(m_sModuleLongName); m_xModule = css::uno::Reference< css::ui::XAcceleratorConfiguration >(xUICfgManager->getShortCutManager(), css::uno::UNO_QUERY_THROW); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 9575d7257d28..325689946a1b 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -62,12 +62,13 @@ #include "eventdlg.hxx" #include <dialmgr.hxx> +#include <comphelper/componentcontext.hxx> #include <comphelper/documentinfo.hxx> #include <comphelper/processfactory.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ItemStyle.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> @@ -1688,9 +1689,7 @@ void SvxConfigPage::Reset( const SfxItemSet& ) } uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > - xModuleCfgSupplier( xServiceManager->createInstance( - OUString( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" )), - uno::UNO_QUERY ); + xModuleCfgSupplier( css::ui::ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(xServiceManager).getUNOContext()) ); // Set up data for module specific menus SaveInData* pModuleData = NULL; |