remove connectivity OSubComponent

push the logic that is still necessary down into the subclasses

Change-Id: I99424f0b3c654c5652991a4140b17ceb02224e50
Reviewed-on: https://gerrit.libreoffice.org/49087
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 11 insertions, 52 deletions

diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index d546ab8ef154..a9c34814debe 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <connectivity/OSubComponent.hxx>
 #include <map>
 #include <connectivity/CommonTools.hxx>
 #include <OTypeInfo.hxx>
@@ -48,11 +47,8 @@ namespace connectivity
         typedef connectivity::OMetaConnection                           OConnection_BASE;
 
 
-        class OConnection : public OConnection_BASE,
-                            public connectivity::OSubComponent<OConnection, OConnection_BASE>
+        class OConnection : public OConnection_BASE
         {
-            friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
-
         protected:
 
             // Data attributes
@@ -87,8 +83,6 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
-            // XInterface
-            virtual void SAL_CALL release() throw() override;
 
             // XConnection
             virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index 3212f8220868..4f096b5fffc2 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -52,11 +52,9 @@ namespace connectivity
         class OStatement_Base       :   public cppu::BaseMutex,
                                         public  OStatement_BASE,
                                         public  ::cppu::OPropertySetHelper,
-                                        public  ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>,
-                                        public  connectivity::OSubComponent<OStatement_Base, OStatement_BASE>
+                                        public  ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
 
         {
-            friend class connectivity::OSubComponent<OStatement_Base, OStatement_BASE>;
             friend class OResultSet;
 
             css::sdbc::SQLWarning          m_aLastWarning;
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index fe535c9d0fdf..ddb3dbc63264 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <connectivity/OSubComponent.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <OTypeInfo.hxx>
 #include <rtl/ustring.hxx>
@@ -42,12 +41,8 @@ namespace connectivity
         class ODatabaseMetaData;
         class OFileDriver;
 
-        class OOO_DLLPUBLIC_FILE OConnection :
-                            public connectivity::OMetaConnection,
-                            public connectivity::OSubComponent<OConnection, connectivity::OMetaConnection>
+        class OOO_DLLPUBLIC_FILE OConnection : public connectivity::OMetaConnection
         {
-            friend class connectivity::OSubComponent<OConnection, connectivity::OMetaConnection>;
-
         protected:
 
             // Data attributes
@@ -82,8 +77,6 @@ namespace connectivity
 
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
-            // XInterface
-            virtual void SAL_CALL release() throw() override;
 
             // XServiceInfo
             DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 936703b4d281..fd5006c83253 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -162,15 +162,11 @@ namespace connectivity
             virtual void SAL_CALL close(  ) override;
         };
 
-        class OOO_DLLPUBLIC_FILE OStatement_BASE2 :
-                                    public OStatement_Base,
-                                    public connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>
+        class OOO_DLLPUBLIC_FILE OStatement_BASE2 : public OStatement_Base
 
         {
-            friend class connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>;
         public:
-            OStatement_BASE2(OConnection* _pConnection ) :  OStatement_Base(_pConnection ),
-                                    connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>(static_cast<cppu::OWeakObject*>(_pConnection), this){}
+            OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ) {}
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
             // XInterface
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index bab9329dfb1c..528f0eddf537 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -22,7 +22,6 @@
 #include <java/lang/Object.hxx>
 #include <TConnection.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <connectivity/OSubComponent.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <AutoRetrievingBase.hxx>
 #include <java/sql/ConnectionLog.hxx>
@@ -39,10 +38,8 @@ namespace connectivity
 
     class java_sql_Connection : public java_sql_Connection_BASE,
                                 public java_lang_Object,
-                                public OSubComponent<java_sql_Connection, java_sql_Connection_BASE>,
                                 public OAutoRetrievingBase
     {
-        friend class OSubComponent<java_sql_Connection, java_sql_Connection_BASE>;
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
         const java_sql_Driver*  m_pDriver;
         jobject                 m_pDriverobject;
@@ -110,8 +107,6 @@ namespace connectivity
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
-        // XInterface
-        virtual void SAL_CALL release() throw() override;
 
         // XConnection
         virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement(  ) override;
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index 52b6c5fe5995..a6cde3aa2ac3 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -32,7 +32,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <connectivity/OSubComponent.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <java/sql/Connection.hxx>
@@ -196,19 +195,14 @@ namespace connectivity
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
     };
 
-    class OStatement_BASE2  :public java_sql_Statement_Base
-                            ,public OSubComponent<OStatement_BASE2, java_sql_Statement_BASE>
+    class OStatement_BASE2 : public java_sql_Statement_Base
 
     {
-        friend class OSubComponent<OStatement_BASE2, java_sql_Statement_BASE>;
     public:
-        OStatement_BASE2(JNIEnv * pEnv, java_sql_Connection& _rCon ) : java_sql_Statement_Base( pEnv, _rCon ),
-                                OSubComponent<OStatement_BASE2, java_sql_Statement_BASE>(static_cast<cppu::OWeakObject*>(&_rCon), this){}
+        OStatement_BASE2(JNIEnv * pEnv, java_sql_Connection& _rCon ) : java_sql_Statement_Base( pEnv, _rCon ) {}
 
         // OComponentHelper
         virtual void SAL_CALL disposing() override;
-        // XInterface
-        virtual void SAL_CALL release() throw() override;
     };
 
     class java_sql_Statement :  public OStatement_BASE2,
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index f9cd473b3b77..3cfda3792a8e 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <connectivity/odbc.hxx>
 #include <odbc/odbcbasedllapi.hxx>
-#include <connectivity/OSubComponent.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <TConnection.hxx>
 #include <OTypeInfo.hxx>
@@ -46,11 +45,8 @@ namespace connectivity
 
         class OOO_DLLPUBLIC_ODBCBASE OConnection :
                             public OConnection_BASE,
-                            public connectivity::OSubComponent<OConnection, OConnection_BASE>,
                             public OAutoRetrievingBase
         {
-            friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
-
         protected:
 
             // Data attributes
@@ -87,8 +83,6 @@ namespace connectivity
 
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
-            // XInterface
-            virtual void SAL_CALL release() throw() override;
 
             // XServiceInfo
             DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index e93f6c7ba5dd..29d4f51612ba 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -211,19 +211,14 @@ namespace connectivity
             using OPropertySetHelper::getFastPropertyValue;
         };
 
-        class OOO_DLLPUBLIC_ODBCBASE OStatement_BASE2 :
-                                 public OStatement_Base
-                                ,public ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>
-
+        class OOO_DLLPUBLIC_ODBCBASE OStatement_BASE2 : public OStatement_Base
         {
-            friend class OSubComponent<OStatement_BASE2, OStatement_BASE>;
         public:
-            OStatement_BASE2(OConnection* _pConnection ) :  OStatement_Base(_pConnection ),
-                                    ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>(static_cast<cppu::OWeakObject*>(_pConnection), this){}
+            OStatement_BASE2(OConnection* _pConnection ) :
+                OStatement_Base(_pConnection )
+            {}
             // OComponentHelper
             virtual void SAL_CALL disposing() override;
-            // XInterface
-            virtual void SAL_CALL release() throw() override;
         };
 
         class OOO_DLLPUBLIC_ODBCBASE OStatement :