fdo#46808, Convert comphelper::ComponentContext in forms module

Change-Id: I8a9913d964633381f00c0a4885cc655805fa1974

4 files changed, 12 insertions, 11 deletions

diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index b9c0575659b7..573429662e26 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -44,6 +44,7 @@ namespace frm
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::frame::XModel;
     using ::com::sun::star::ui::XImageManager;
     using ::com::sun::star::ui::XUIConfigurationManagerSupplier;
@@ -62,7 +63,7 @@ namespace frm
     class DocumentCommandImageProvider : public ICommandImageProvider
     {
     public:
-        DocumentCommandImageProvider( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument )
+        DocumentCommandImageProvider( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
         {
             impl_init_nothrow( _rContext, _rxDocument );
         }
@@ -74,7 +75,7 @@ namespace frm
         virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const;
 
     private:
-        void    impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument );
+        void    impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument );
 
     private:
         Reference< XImageManager >    m_xDocumentImageManager;
@@ -82,7 +83,7 @@ namespace frm
     };
 
     //--------------------------------------------------------------------
-    void DocumentCommandImageProvider::impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument )
+    void DocumentCommandImageProvider::impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
     {
         OSL_ENSURE( _rxDocument.is(), "DocumentCommandImageProvider::impl_init_nothrow: no document => no images!" );
         if ( !_rxDocument.is() )
@@ -103,11 +104,11 @@ namespace frm
         // obtain the image manager or the module
         try
         {
-            Reference< XModuleManager2 > xModuleManager( ModuleManager::create(_rContext.getUNOContext()) );
+            Reference< XModuleManager2 > xModuleManager( ModuleManager::create(_rContext) );
             OUString sModuleID = xModuleManager->identify( _rxDocument );
 
             Reference< XModuleUIConfigurationManagerSupplier > xSuppUIConfig(
-                ModuleUIConfigurationManagerSupplier::create(_rContext.getUNOContext()) );
+                ModuleUIConfigurationManagerSupplier::create(_rContext) );
             Reference< XUIConfigurationManager > xUIConfig(
                 xSuppUIConfig->getUIConfigurationManager( sModuleID ), UNO_SET_THROW );
             m_xModuleImageManager.set( xUIConfig->getImageManager(), UNO_QUERY_THROW );
@@ -159,7 +160,7 @@ namespace frm
 
     //--------------------------------------------------------------------
     PCommandImageProvider createDocumentCommandImageProvider(
-        const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument )
+        const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
     {
         PCommandImageProvider pImageProvider( new DocumentCommandImageProvider( _rContext, _rxDocument ) );
         return pImageProvider;
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index e385d51f38d1..7435cc0d367e 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -34,7 +34,7 @@ namespace frm
     //= ControlFeatureInterception
     //====================================================================
     //--------------------------------------------------------------------
-    ControlFeatureInterception::ControlFeatureInterception( const Reference< XMultiServiceFactory >& _rxORB )
+    ControlFeatureInterception::ControlFeatureInterception( const Reference< XComponentContext >& _rxORB )
         :m_pUrlTransformer( new UrlTransformer( _rxORB ) )
     {
     }
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index dc3004f2337e..dea35af2bfe2 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -44,7 +44,7 @@ namespace frm
     //==================================================================
     DBG_NAME( OFormNavigationHelper )
     //------------------------------------------------------------------
-    OFormNavigationHelper::OFormNavigationHelper( const Reference< XMultiServiceFactory >& _rxORB )
+    OFormNavigationHelper::OFormNavigationHelper( const Reference< XComponentContext >& _rxORB )
         :m_xORB( _rxORB )
         ,m_nConnectedFeatures( 0 )
     {
@@ -379,7 +379,7 @@ namespace frm
     //= OFormNavigationMapper
     //==================================================================
     //------------------------------------------------------------------
-    OFormNavigationMapper::OFormNavigationMapper( const Reference< XMultiServiceFactory >& _rxORB )
+    OFormNavigationMapper::OFormNavigationMapper( const Reference< XComponentContext >& _rxORB )
     {
         m_pUrlTransformer.reset( new UrlTransformer( _rxORB ) );
     }
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index f5f584df1e7d..3b3604952414 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -36,7 +36,7 @@ namespace frm
     //= UrlTransformer
     //====================================================================
     //--------------------------------------------------------------------
-    UrlTransformer::UrlTransformer( const Reference< XMultiServiceFactory >& _rxORB )
+    UrlTransformer::UrlTransformer( const Reference< XComponentContext >& _rxORB )
         :m_xORB( _rxORB )
         ,m_bTriedToCreateTransformer( false )
     {
@@ -51,7 +51,7 @@ namespace frm
         {
             if ( m_xORB.is() )
             {
-                m_xTransformer.set(URLTransformer::create(comphelper::getComponentContext(m_xORB)));
+                m_xTransformer.set(URLTransformer::create(m_xORB));
             }
 
             m_bTriedToCreateTransformer = true;