use more concrete UNO classes in connectivity

Change-Id: I5c70278add0aa0b0c4a7680c6615b75b688f2180
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173247
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

8 files changed, 26 insertions, 12 deletions

diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index f0a3fef76d00..28c504ee416b 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -40,6 +40,8 @@
 
 namespace connectivity
 {
+    class ODatabaseMetaDataResultSetMetaData;
+
     typedef ::comphelper::WeakComponentImplHelper<   css::sdbc::XResultSet,
                                                css::sdbc::XRow,
                                                css::sdbc::XResultSetMetaDataSupplier,
@@ -106,7 +108,7 @@ namespace connectivity
     private:
         ORowSetValue                    m_aEmptyValue;
         css::uno::WeakReferenceHelper    m_aStatement;
-        css::uno::Reference< css::sdbc::XResultSetMetaData>        m_xMetaData;
+        rtl::Reference< ODatabaseMetaDataResultSetMetaData>        m_xMetaData;
         sal_Int32                       m_nColPos;
 
         sal_Int32                       m_nFetchSize;
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 4d8c7715ca2d..de5d25ac3233 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -27,8 +27,11 @@
 #include <functional>
 #include <connectivity/dbtoolsdllapi.hxx>
 
+namespace comphelper { class OEventListenerHelper; }
+
 namespace connectivity
 {
+
         class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
                                         public  cppu::BaseMutex,
                                         public ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData2,
@@ -65,7 +68,7 @@ namespace connectivity
             }
         protected:
             css::uno::Reference< css::sdbc::XConnection >     m_xConnection;
-            css::uno::Reference< css::lang::XEventListener>   m_xListenerHelper; // forward the calls from the connection to me
+            rtl::Reference< comphelper::OEventListenerHelper> m_xListenerHelper; // forward the calls from the connection to me
 
             virtual ~ODatabaseMetaDataBase() override;
 
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index f83d74a6d065..7adbf40d2b7f 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -29,6 +29,7 @@
 
 namespace connectivity::file
     {
+        class OResultSetMetaData;
 
         class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OPreparedStatement : public  OStatement_BASE2,
                                     public  css::sdbc::XPreparedStatement,
@@ -42,7 +43,7 @@ namespace connectivity::file
             // Data attributes
 
             OValueRefRow                                          m_aParameterRow;
-            css::uno::Reference< css::sdbc::XResultSetMetaData>   m_xMetaData;
+            rtl::Reference<OResultSetMetaData>                    m_xMetaData;
 
             ::rtl::Reference<connectivity::OSQLColumns>           m_xParamColumns;    // the parameter columns
 
@@ -113,6 +114,8 @@ namespace connectivity::file
                         virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
             virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
+
+            const rtl::Reference<OResultSetMetaData> & getMetaDataImpl();
         };
 
 }
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 0870593e6388..b4c1786fd2d5 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -41,9 +41,12 @@
 #include <TSkipDeletedSet.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <o3tl/safeint.hxx>
+#include "FResultSetMetaData.hxx"
 
 namespace connectivity::file
     {
+        class OResultSetMetaData;
+
         typedef ::cppu::WeakComponentImplHelper<  css::sdbc::XResultSet,
                                                   css::sdbc::XRow,
                                                   css::sdbc::XResultSetMetaDataSupplier,
@@ -96,7 +99,7 @@ namespace connectivity::file
             sal_Int32                               m_nResultSetConcurrency;
 
             css::uno::Reference< css::uno::XInterface>            m_xStatement;
-            css::uno::Reference< css::sdbc::XResultSetMetaData>   m_xMetaData;
+            rtl::Reference< OResultSetMetaData>                   m_xMetaData;
             css::uno::Reference< css::container::XNameAccess>     m_xColNames; // table columns
             css::uno::Reference< css::container::XIndexAccess>    m_xColsIdx; // table columns
 
@@ -267,7 +270,7 @@ namespace connectivity::file
 
             void setOrderByColumns(std::vector<sal_Int32>&& _aColumnOrderBy)  { m_aOrderbyColumnNumber = std::move(_aColumnOrderBy); }
             void setOrderByAscending(std::vector<TAscendingOrder>&& _aOrderbyAsc)    { m_aOrderbyAscending = std::move(_aOrderbyAsc); }
-            void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
+            void setMetaData(const rtl::Reference< OResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
 
             static void setBoundedColumns(const OValueRefRow& _rRow,
                                     const OValueRefRow& _rSelectRow,
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 183c6fa3a362..2b4190ba956e 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -59,7 +59,7 @@ namespace connectivity
                                 public  ::cppu::OPropertySetHelper,
                                 public  ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet>
     {
-        css::uno::Reference< css::uno::XInterface>            m_xStatement;
+        rtl::Reference<java_sql_Statement_Base>               m_xStatement;
         java::sql::ConnectionLog                              m_aLogger;
         java_sql_Connection*                                  m_pConnection;
 
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index b0dc5cec35db..4b151b2517ed 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -42,6 +42,7 @@
 
 namespace connectivity::odbc
     {
+        class OResultSetMetaData;
         /*
         **  java_sql_ResultSet
         */
@@ -68,8 +69,7 @@ namespace connectivity::odbc
 
             SQLHANDLE                                   m_aStatementHandle;   // ... until freed
             css::uno::WeakReferenceHelper               m_aStatement;
-            css::uno::Reference< css::sdbc::XResultSetMetaData>
-                                                        m_xMetaData;
+            rtl::Reference<OResultSetMetaData>          m_xMetaData;
             std::unique_ptr<SQLUSMALLINT[]>             m_pRowStatusArray;
             rtl::Reference<OConnection>                 m_pConnection;
             rtl_TextEncoding                            m_nTextEncoding;
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index aa5e895bfc79..348c355453e6 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -30,7 +30,7 @@
 
 namespace connectivity::odbc
     {
-
+        class OResultSetMetaData;
         class OBoundParam;
         typedef ::cppu::ImplHelper5<    css::sdbc::XPreparedStatement,
                                         css::sdbc::XParameters,
@@ -51,7 +51,7 @@ namespace connectivity::odbc
             std::unique_ptr<OBoundParam[]>  boundParams;
                             // Array of bound parameter objects. Each parameter marker will have a
                             // corresponding object to hold bind information, and resulting data.
-            css::uno::Reference< css::sdbc::XResultSetMetaData >  m_xMetaData;
+            rtl::Reference<OResultSetMetaData>  m_xMetaData;
             bool                                                                        m_bPrepared;
 
             void FreeParams();
@@ -137,6 +137,7 @@ namespace connectivity::odbc
             virtual void SAL_CALL close(  ) override;
             // XResultSetMetaDataSupplier
             virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
+            const rtl::Reference< OResultSetMetaData > & getMetaDataImpl();
 
         public:
             using OStatement_Base::executeQuery;
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 5c8328082904..c7638a18d8b9 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -40,9 +40,11 @@
 #include <connectivity/FValue.hxx>
 #include <TSkipDeletedSet.hxx>
 #include <memory>
+#include "OResultSetMetaData.hxx"
 
 namespace connectivity::odbc
     {
+        class OResultSetMetaData;
 
         /*
         **  java_sql_ResultSet
@@ -132,7 +134,7 @@ namespace connectivity::odbc
             OStatement_Base*                            m_pStatement;
             std::unique_ptr<OSkipDeletedSet>            m_pSkipDeletedSet;
             css::uno::Reference< css::uno::XInterface>    m_xStatement;
-            css::uno::Reference< css::sdbc::XResultSetMetaData>        m_xMetaData;
+            rtl::Reference< OResultSetMetaData>        m_xMetaData;
             std::unique_ptr<SQLUSMALLINT[]>             m_pRowStatusArray;
             rtl_TextEncoding                            m_nTextEncoding;
             sal_Int32                                   m_nRowPos;
@@ -235,7 +237,7 @@ namespace connectivity::odbc
                 return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this));
             }
 
-            void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
+            void setMetaData(const rtl::Reference<OResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
 
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;