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>
---
 include/connectivity/sdbcx/VCatalog.hxx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'include/connectivity/sdbcx')

diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index a5e1dfbb2b1b..e39cd11abb22 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -30,7 +30,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <connectivity/CommonTools.hxx>
-#include <connectivity/OSubComponent.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <memory>
@@ -55,10 +54,8 @@ namespace connectivity
         class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog :
                             public OCatalog_BASE,
                             public IRefreshableGroups,
-                            public IRefreshableUsers,
-                            public connectivity::OSubComponent<OCatalog, OCatalog_BASE>
+                            public IRefreshableUsers
         {
-            friend class connectivity::OSubComponent<OCatalog, OCatalog_BASE>;
         protected:
 
             ::osl::Mutex        m_aMutex;
@@ -104,8 +101,6 @@ namespace connectivity
 
             // ::cppu::OComponentHelper
             virtual void SAL_CALL disposing() override;
-            // XInterface
-            void SAL_CALL release() throw() override;
             // XTablesSupplier
             virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables(  ) override;
             // XViewsSupplier
-- 
cgit