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>

2 files changed, 1 insertions, 95 deletions

diff --git a/include/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx
deleted file mode 100644
index 0ee4e1248099..000000000000
--- a/include/connectivity/OSubComponent.hxx
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CONNECTIVITY_OSUBCOMPONENT_HXX
-#define INCLUDED_CONNECTIVITY_OSUBCOMPONENT_HXX
-
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/interfacecontainer.h>
-#include <connectivity/dbtoolsdllapi.hxx>
-
-namespace com
-{
-    namespace sun
-    {
-        namespace star
-        {
-            namespace lang
-            {
-                class XComponent;
-            }
-        }
-    }
-}
-namespace connectivity
-{
-    OOO_DLLPUBLIC_DBTOOLS
-    void release(oslInterlockedCount& _refCount,
-                 ::cppu::OBroadcastHelper& rBHelper,
-                 css::uno::Reference< css::uno::XInterface >& _xInterface,
-                 css::lang::XComponent* _pObject) throw ();
-
-    // OSubComponent
-
-    template <class SELF, class WEAK> class OSubComponent
-    {
-    protected:
-        // the parent must support the tunnel implementation
-        css::uno::Reference< css::uno::XInterface > m_xParent;
-        SELF*   m_pDerivedImplementation;
-
-    public:
-        OSubComponent(
-                const css::uno::Reference< css::uno::XInterface >& _xParent,
-                SELF* _pDerivedImplementation)
-            :m_xParent(_xParent)
-            ,m_pDerivedImplementation(_pDerivedImplementation)
-        {
-        }
-
-    protected:
-        void dispose_ChildImpl()
-        {
-            // avoid ambiguity
-            ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex );
-        m_xParent.clear();
-        }
-        void release_ChildImpl() throw ()
-        {
-#if 0
-            ::connectivity::release(m_pDerivedImplementation->m_refCount,
-                                    m_pDerivedImplementation->WEAK::rBHelper,
-                                    m_xParent,
-                                    m_pDerivedImplementation);
-
-#endif
-            m_pDerivedImplementation->WEAK::release();
-        }
-    };
-}
-
-#endif // INCLUDED_CONNECTIVITY_OSUBCOMPONENT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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