fdo#46808, Adapt ModuleUIConfigurationManagerSupplier UNO service to new style

Change-Id: I58b17349474b974edd24aa17ec08ffa848a92ae9

3 files changed, 11 insertions, 14 deletions

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index ab1f31b46c7f..5067b1634f5e 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -23,7 +23,7 @@
 #include "dbu_app.hrc"
 #include "AppView.hxx"
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
@@ -43,6 +43,7 @@
 #include "dbtreelistbox.hxx"
 #include "IApplicationController.hxx"
 #include "imageprovider.hxx"
+#include "comphelper/componentcontext.hxx"
 
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
@@ -475,11 +476,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
     try
     {
         Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier(
-            getDetailView()->getBorderWin().getView()->getORB()->createInstance(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) )
-            ) ,
-            UNO_QUERY
-        );
+            ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(getDetailView()->getBorderWin().getView()->getORB()).getUNOContext()) );
         Reference< XUIConfigurationManager > xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(
             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OfficeDatabaseDocument" ) )
         );
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 6f95cc1a9c55..750289b5a4d7 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
@@ -52,6 +52,7 @@ namespace dbaui
         using ::com::sun::star::container::XNameAccess;
         using ::com::sun::star::lang::XMultiServiceFactory;
         using ::com::sun::star::beans::PropertyValue;
+        using ::com::sun::star::ui::ModuleUIConfigurationManagerSupplier;
         using ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier;
         using ::com::sun::star::ui::XUIConfigurationManager;
         using ::com::sun::star::ui::XImageManager;
@@ -124,14 +125,12 @@ namespace dbaui
                 do
                 {
                     // Retrieve popup menu labels
-                    Reference< XMultiServiceFactory> xFactory( ::comphelper::getProcessServiceFactory() );
-                    if ( !xFactory.is() )
+                    Reference< com::sun::star::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
+                    if ( !xContext.is() )
                         break;
 
                     Reference< XModuleUIConfigurationManagerSupplier > xSupplier(
-                        xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ),
-                        UNO_QUERY_THROW );
+                        ModuleUIConfigurationManagerSupplier::create(xContext) );
 
                     Reference< XUIConfigurationManager > xManager( xSupplier->getUIConfigurationManager( _rModuleName ) );
                     Reference< XImageManager > xImageManager;
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 6faa3bed4004..f5c28384d606 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -23,7 +23,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/menu.hxx>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <vcl/svapp.hxx>
@@ -36,6 +36,7 @@
 #include <osl/mutex.hxx>
 #include "dbu_reghelper.hxx"
 #include "UITools.hxx"
+#include <comphelper/componentcontext.hxx>
 
 
 extern "C" void SAL_CALL createRegistryInfo_OToolboxController()
@@ -185,7 +186,7 @@ namespace dbaui
 
             try
             {
-                Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(getServiceManager()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY);
+                Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::ComponentContext(getServiceManager()).getUNOContext()));
                 Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")));
                 Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY);