From 1b67ad6ff8979d8851db1223886bb03745845755 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 1 Feb 2018 13:54:31 +0200
Subject: 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>
---
 connectivity/source/inc/file/FConnection.hxx | 9 +--------
 connectivity/source/inc/file/FStatement.hxx  | 8 ++------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'connectivity/source/inc/file')

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
-- 
cgit