fdo#46808, Convert a bunch of comphelper::ComponentContext stuff

.. to Reference<XComponentContext>
mostly in the dbaccess module, but it also affected some other
modules.

Change-Id: I09b3f6fe7a9b33498b11d98b5521b5aeeb8882be

9 files changed, 44 insertions, 45 deletions

diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index e10dc3688af5..67988f86f88c 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <comphelper/componentcontext.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
@@ -75,7 +74,6 @@ namespace dbaccess
     using ::com::sun::star::frame::XModel;
     using ::com::sun::star::util::XModifiable;
     using ::com::sun::star::beans::XPropertySet;
-    using ::com::sun::star::lang::XMultiServiceFactory;
     /** === end UNO using === **/
 
     namespace ElementModes = ::com::sun::star::embed::ElementModes;
@@ -135,7 +133,7 @@ namespace dbaccess
             return s_sMapStreamEncodingName;
         }
 
-        static void lcl_writeObjectMap_throw( const ::comphelper::ComponentContext& i_rContext, const Reference< XStorage >& i_rStorage,
+        static void lcl_writeObjectMap_throw( const Reference<XComponentContext> & i_rContext, const Reference< XStorage >& i_rStorage,
             const MapStringToCompDesc& i_mapStorageToCompDesc )
         {
             if ( i_mapStorageToCompDesc.empty() )
@@ -251,9 +249,9 @@ namespace dbaccess
     //====================================================================
     struct DBACCESS_DLLPRIVATE DatabaseDocumentRecovery_Data
     {
-        const ::comphelper::ComponentContext aContext;
+        const Reference<XComponentContext> aContext;
 
-        DatabaseDocumentRecovery_Data( const ::comphelper::ComponentContext& i_rContext )
+        DatabaseDocumentRecovery_Data( const Reference<XComponentContext> & i_rContext )
             :aContext( i_rContext )
         {
         }
@@ -263,7 +261,7 @@ namespace dbaccess
     //= DatabaseDocumentRecovery
     //====================================================================
     //--------------------------------------------------------------------
-    DatabaseDocumentRecovery::DatabaseDocumentRecovery( const ::comphelper::ComponentContext& i_rContext )
+    DatabaseDocumentRecovery::DatabaseDocumentRecovery( const Reference<XComponentContext> & i_rContext )
         :m_pData( new DatabaseDocumentRecovery_Data( i_rContext ) )
     {
     }
@@ -352,7 +350,7 @@ namespace dbaccess
 
             Reference< XStorage > xComponentsStor( xRecoveryStorage->openStorageElement(
                 SubComponentRecovery::getComponentsStorageName( aKnownTypes[i] ), ElementModes::READ ) );
-            lcl_readObjectMap_throw( m_pData->aContext.getUNOContext(), xComponentsStor, aMapCompDescs[ aKnownTypes[i] ] );
+            lcl_readObjectMap_throw( m_pData->aContext, xComponentsStor, aMapCompDescs[ aKnownTypes[i] ] );
             xComponentsStor->dispose();
         }
 
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index 0c4d1165d1fb..900fc39e3f4d 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -41,6 +41,7 @@ namespace dbaccess
     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::embed::XStorage;
     using ::com::sun::star::io::XStream;
     /** === end UNO using === **/
@@ -50,7 +51,7 @@ namespace dbaccess
     //= StorageOutputStream
     //====================================================================
     //--------------------------------------------------------------------
-    StorageOutputStream::StorageOutputStream(   const ::comphelper::ComponentContext& i_rContext,
+    StorageOutputStream::StorageOutputStream(   const Reference<XComponentContext>& i_rContext,
                                                 const Reference< XStorage >& i_rParentStorage,
                                                 const ::rtl::OUString& i_rStreamName
                                              )
@@ -83,7 +84,7 @@ namespace dbaccess
     //= StorageInputStream
     //====================================================================
     //--------------------------------------------------------------------
-    StorageInputStream::StorageInputStream( const ::comphelper::ComponentContext& i_rContext,
+    StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext,
                                             const Reference< XStorage >& i_rParentStorage,
                                             const ::rtl::OUString& i_rStreamName
                                           )
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index c4a4849aef0f..9f9fb0f013b1 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -23,11 +23,7 @@
 #include "dbaccessdllapi.h"
 
 #include <com/sun/star/embed/XStorage.hpp>
-
-namespace comphelper
-{
-    class ComponentContext;
-}
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 //........................................................................
 namespace dbaccess
@@ -43,7 +39,7 @@ namespace dbaccess
     {
     public:
         StorageOutputStream(
-            const ::comphelper::ComponentContext& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
             const ::rtl::OUString& i_rStreamName
         );
@@ -54,12 +50,14 @@ namespace dbaccess
         virtual void close();
 
     protected:
-        const ::comphelper::ComponentContext&   getContext() const { return m_rContext; }
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                                                getContext() const { return m_rContext; }
         const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >&
                                                 getOutputStream() const { return m_xOutputStream; }
 
     private:
-        const ::comphelper::ComponentContext&   m_rContext;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                                                m_rContext;
               ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
                                                 m_xOutputStream;
     };
@@ -73,7 +71,7 @@ namespace dbaccess
     {
     public:
         StorageInputStream(
-            const ::comphelper::ComponentContext& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
             const ::rtl::OUString& i_rStreamName
         );
@@ -84,12 +82,14 @@ namespace dbaccess
         virtual void close();
 
     protected:
-        const ::comphelper::ComponentContext&   getContext() const { return m_rContext; }
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                                                getContext() const { return m_rContext; }
         const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >&
                                                 getInputStream() const { return m_xInputStream; }
 
     private:
-        const ::comphelper::ComponentContext&   m_rContext;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                                                m_rContext;
               ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
                                                 m_xInputStream;
     };
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 7251ddb54f72..8c8cbb37b410 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/io/TextOutputStream.hpp>
 
-#include <comphelper/componentcontext.hxx>
 #include <tools/diagnose_ex.h>
 
 //......................................................................................................................
@@ -42,6 +41,7 @@ namespace dbaccess
     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::embed::XStorage;
     using ::com::sun::star::io::TextOutputStream;
     using ::com::sun::star::io::XTextOutputStream2;
@@ -80,14 +80,14 @@ namespace dbaccess
     //= StorageTextOutputStream
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    StorageTextOutputStream::StorageTextOutputStream(   const ::comphelper::ComponentContext& i_rContext,
+    StorageTextOutputStream::StorageTextOutputStream(   const Reference<XComponentContext>& i_rContext,
                                                         const Reference< XStorage >& i_rParentStorage,
                                                         const ::rtl::OUString& i_rStreamName
                                                     )
         :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
         ,m_pData( new StorageTextOutputStream_Data )
     {
-        m_pData->xTextOutput = TextOutputStream::create( i_rContext.getUNOContext() );
+        m_pData->xTextOutput = TextOutputStream::create( i_rContext );
         m_pData->xTextOutput->setEncoding( lcl_getTextStreamEncodingName() );
         m_pData->xTextOutput->setOutputStream( getOutputStream() );
     }
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index 46924f36fd46..37119d264afa 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -37,7 +37,7 @@ namespace dbaccess
     {
     public:
         StorageTextOutputStream(
-            const ::comphelper::ComponentContext& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
             const ::rtl::OUString& i_rStreamName
         );
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 28f3a17ff1b5..e2f17222895e 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 
-#include <comphelper/componentcontext.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ref.hxx>
 #include <tools/diagnose_ex.h>
@@ -50,6 +49,7 @@ namespace dbaccess
     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::embed::XStorage;
     using ::com::sun::star::xml::sax::XDocumentHandler;
     using ::com::sun::star::xml::sax::XAttributeList;
@@ -77,13 +77,13 @@ namespace dbaccess
     //= StorageXMLOutputStream
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    StorageXMLOutputStream::StorageXMLOutputStream( const ::comphelper::ComponentContext& i_rContext,
+    StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext,
                                                     const Reference< XStorage >& i_rParentStorage,
                                                     const ::rtl::OUString& i_rStreamName )
         :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName )
         ,m_pData( new StorageXMLOutputStream_Data )
     {
-        const Reference< XWriter > xSaxWriter = Writer::create( i_rContext.getUNOContext() );
+        const Reference< XWriter > xSaxWriter = Writer::create( i_rContext );
         xSaxWriter->setOutputStream( getOutputStream() );
 
         m_pData->xHandler.set( xSaxWriter, UNO_QUERY_THROW );
@@ -161,13 +161,13 @@ namespace dbaccess
     //= StorageXMLInputStream
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    StorageXMLInputStream::StorageXMLInputStream( const ::comphelper::ComponentContext& i_rContext,
+    StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext,
                                                   const Reference< XStorage >& i_rParentStorage,
                                                   const ::rtl::OUString& i_rStreamName )
         :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName )
         ,m_pData( new StorageXMLInputStream_Data )
     {
-        m_pData->xParser.set( Parser::create(i_rContext.getUNOContext()) );
+        m_pData->xParser.set( Parser::create(i_rContext) );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index 5f4faf5a76f9..a850b225b4fd 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -27,11 +27,6 @@
 
 #include <memory>
 
-namespace comphelper
-{
-    class ComponentContext;
-}
-
 //........................................................................
 namespace dbaccess
 {
@@ -45,7 +40,7 @@ namespace dbaccess
     {
     public:
         StorageXMLOutputStream(
-            const ::comphelper::ComponentContext& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
             const ::rtl::OUString& i_rStreamName
         );
@@ -79,7 +74,7 @@ namespace dbaccess
     {
     public:
         StorageXMLInputStream(
-            const ::comphelper::ComponentContext& i_rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage,
             const ::rtl::OUString& i_rStreamName
         );
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 951f47604145..58942d810c9b 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -57,6 +57,7 @@ namespace dbaccess
     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::lang::XMultiServiceFactory;
     using ::com::sun::star::embed::XStorage;
     using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
@@ -195,7 +196,7 @@ namespace dbaccess
     class DBACCESS_DLLPRIVATE SettingsExportContext : public ::xmloff::XMLSettingsExportContext
     {
     public:
-        SettingsExportContext( const ::comphelper::ComponentContext& i_rContext, const StorageXMLOutputStream& i_rDelegator )
+        SettingsExportContext( const Reference<XComponentContext>& i_rContext, const StorageXMLOutputStream& i_rDelegator )
             :m_rContext( i_rContext )
             ,m_rDelegator( i_rDelegator )
             ,m_aNamespace( ::xmloff::token::GetXMLToken( ::xmloff::token::XML_NP_CONFIG ) )
@@ -226,7 +227,7 @@ namespace dbaccess
         }
 
     private:
-        const ::comphelper::ComponentContext&   m_rContext;
+        const Reference<XComponentContext>&   m_rContext;
         const StorageXMLOutputStream&           m_rDelegator;
         const ::rtl::OUStringBuffer             m_aNamespace;
     };
@@ -269,7 +270,7 @@ namespace dbaccess
     //--------------------------------------------------------------------
     Reference< com::sun::star::uno::XComponentContext > SettingsExportContext::GetComponentContext() const
     {
-        return m_rContext.getUNOContext();
+        return m_rContext;
     }
 
     //==================================================================================================================
@@ -479,7 +480,7 @@ namespace dbaccess
         m_aCompDesc.sName = aComponentIdentity.Second;
 
         // what the controller didn't give us is the information whether this is in edit mode or not ...
-        Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext.getUNOContext()) );
+        Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext) );
         const ::rtl::OUString sModuleIdentifier = xModuleManager->identify( m_xComponent );
 
         switch ( m_eType )
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 68f75eb1fa43..8e70be04efca 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -24,8 +24,7 @@
 
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-
-#include <comphelper/componentcontext.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 //........................................................................
 namespace dbaccess
@@ -38,7 +37,9 @@ namespace dbaccess
     class DBACCESS_DLLPRIVATE SubComponentRecovery
     {
     public:
-        SubComponentRecovery( const ::comphelper::ComponentContext& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController,
+        SubComponentRecovery(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& i_rComponent )
             :m_rContext( i_rContext )
             ,m_xDocumentUI( i_rController, ::com::sun::star::uno::UNO_SET_THROW )
@@ -49,7 +50,9 @@ namespace dbaccess
             impl_identifyComponent_throw();
         }
 
-        SubComponentRecovery( const ::comphelper::ComponentContext& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController,
+        SubComponentRecovery(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController,
                 const SubComponentType i_eType )
             :m_rContext( i_rContext )
             ,m_xDocumentUI( i_rController, ::com::sun::star::uno::UNO_SET_THROW )
@@ -101,7 +104,8 @@ namespace dbaccess
         void    impl_identifyComponent_throw();
 
     private:
-        const ::comphelper::ComponentContext&   m_rContext;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+                                                m_rContext;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >
                                                 m_xDocumentUI;
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >