fdo#46808, Convert ComponentContext in connectivity,extension..

...modules.

Change-Id: Ie61976dc12b514bb85ca42496c0d9173a1c56264

5 files changed, 10 insertions, 19 deletions

diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index 565854ba7ed8..06fcc62f548d 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -21,15 +21,11 @@
 #define CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX
 
 #include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <memory>
 #include "connectivity/dbtoolsdllapi.hxx"
 
-namespace comphelper
-{
-    class ComponentContext;
-}
-
 //........................................................................
 namespace dbtools
 {
@@ -170,7 +166,7 @@ namespace dbtools
                 the component context we operate in. Might be needed to create the
                 css.sdbc.DriverManager instance.
         */
-        bool    supportsUserAdministration( const ::comphelper::ComponentContext& _rContext ) const;
+        bool    supportsUserAdministration( const css::uno::Reference<css::uno::XComponentContext>& _rContext ) const;
 
         /** determines whether in the application UI, empty table folders (aka catalogs/schemas) should be displayed
         */
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index fe5c4dbfff52..79e422804351 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -20,10 +20,11 @@
 #ifndef CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 #define CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 
-#include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/sdb/XColumnUpdate.hpp>
+#include <com/sun/star/sdbc/XRowSet.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 
 #include <boost/noncopyable.hpp>
@@ -31,8 +32,6 @@
 #include <memory>
 #include "connectivity/dbtoolsdllapi.hxx"
 
-namespace comphelper { class ComponentContext; }
-
 //........................................................................
 namespace dbtools
 {
@@ -60,7 +59,7 @@ namespace dbtools
             examining its <code>ActiveConnection</code>.
         */
         FormattedColumnValue(
-            const ::comphelper::ComponentContext& _rContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
         );
diff --git a/include/connectivity/virtualdbtools.hxx b/include/connectivity/virtualdbtools.hxx
index 9083016fa621..10d32b3f00a7 100644
--- a/include/connectivity/virtualdbtools.hxx
+++ b/include/connectivity/virtualdbtools.hxx
@@ -76,10 +76,6 @@ namespace dbtools {
     class FormattedColumnValue;
 }
 
-namespace comphelper {
-    class ComponentContext;
-}
-
 //========================================================================
 //= entry into this library
 //========================================================================
@@ -336,7 +332,7 @@ namespace connectivity
         public:
             /// creates a simple version of the class OSQLParser
             virtual ::rtl::Reference< ISQLParser > createSQLParser(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
                 const IParseContext* _pContext
                 ) const = 0;
 
@@ -350,7 +346,7 @@ namespace connectivity
             virtual ::rtl::Reference< IDataAccessTools > getDataAccessTools() = 0;
 
             virtual ::std::auto_ptr< ::dbtools::FormattedColumnValue >  createFormattedColumnValue(
-                const ::comphelper::ComponentContext& _rContext,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
             ) = 0;
diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index 6acb2194a810..451e3744417c 100644
--- a/include/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
@@ -21,11 +21,11 @@
 #define SVX_DATABASELOCATIONINPUT_HXX
 
 #include "svx/svxdllapi.h"
+#include "com/sun/star/uno/XComponentContext.hpp"
 
 class PushButton;
 class String;
 namespace svt { class OFileURLControl; }
-namespace comphelper { class ComponentContext; }
 
 #include <memory>
 
@@ -50,7 +50,7 @@ namespace svx
     {
     public:
         DatabaseLocationInputController(
-            const ::comphelper::ComponentContext&   _rContext,
+            const css::uno::Reference<css::uno::XComponentContext>& _rContext,
             ::svt::OFileURLControl&                 _rLocationInput,
             PushButton&                             _rBrowseButton
         );
diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx
index c1afd4690509..e927a27af7b2 100644
--- a/include/svx/dbtoolsclient.hxx
+++ b/include/svx/dbtoolsclient.hxx
@@ -188,7 +188,7 @@ namespace svxform
 
         // ------------------------------------------------
         ::std::auto_ptr< ::dbtools::FormattedColumnValue >  createFormattedColumnValue(
-            const ::comphelper::ComponentContext& _rContext,
+            const css::uno::Reference<css::uno::XComponentContext>& _rContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn
         );