OSubComponent.hxx is included by a header from inc -> move

13 files changed, 12 insertions, 106 deletions

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 8fcb43993b6a..ebed52b5353d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -87,7 +87,7 @@
 
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 
 #include <algorithm>
 
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index c61d938ccf2c..31598de04f2b 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -32,7 +32,7 @@
 #include "NDriver.hxx"
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include "connectivity/CommonTools.hxx"
 #include "connectivity/warningscontainer.hxx"
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 36c1f7d359f0..d6154e4e6b1b 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -47,7 +47,7 @@
 #include "connectivity/FValue.hxx"
 #include "connectivity/warningscontainer.hxx"
 #include "NStatement.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "NResultSetMetaData.hxx"
 
 namespace connectivity
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index e292a8fb317a..f64bc67be71c 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -43,7 +43,7 @@
 #include "connectivity/sqliterator.hxx"
 #include "connectivity/sqlparse.hxx"
 #include <connectivity/FValue.hxx>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <com/sun/star/util/XCancellable.hpp>
 #include <cppuhelper/compbase5.hxx>
 #include <comphelper/propertycontainer.hxx>
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index b58460c0a80d..5da3726b14b3 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -30,7 +30,7 @@
 #define _CONNECTIVITY_KAB_CONNECTION_HXX_
 
 #include <map>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index f149847958b9..678e191609cd 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -30,7 +30,7 @@
 #define _CONNECTIVITY_MACAB_CONNECTION_HXX_
 
 #include <map>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 76dcb328c2c4..739feb46f112 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -32,7 +32,7 @@
 
 #include "MCatalog.hxx"
 #include "MColumnAlias.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "TConnection.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
deleted file mode 100644
index 8db7336b16d1..000000000000
--- a/connectivity/source/inc/OSubComponent.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_
-#define _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,
-                 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                 ::com::sun::star::lang::XComponent* _pObject);
-    //************************************************************
-    // OSubComponent
-    //************************************************************
-    template <class SELF, class WEAK> class OSubComponent
-    {
-    protected:
-        // the parent must support the tunnel implementation
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
-        SELF*   m_pDerivedImplementation;
-
-    public:
-        OSubComponent(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::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 relase_ChildImpl()
-        {
-            ::connectivity::release(m_pDerivedImplementation->m_refCount,
-                                    m_pDerivedImplementation->WEAK::rBHelper,
-                                    m_xParent,
-                                    m_pDerivedImplementation);
-
-            m_pDerivedImplementation->WEAK::release();
-        }
-    };
-}
-#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 4be35ae52fff..9fcde4164ca4 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <map>
 #include "connectivity/CommonTools.hxx"
 #include "OTypeInfo.hxx"
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 244d8055b4a8..73a064f50c6f 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #ifndef _MAP_
 #include <map>
 #endif
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index bb2fd5f86500..b410c221da4c 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -31,7 +31,7 @@
 #include "java/lang/Object.hxx"
 #include "TConnection.hxx"
 #include "connectivity/CommonTools.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <cppuhelper/weakref.hxx>
 #include "AutoRetrievingBase.hxx"
 #include "java/sql/ConnectionLog.hxx"
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index b32989772d2e..ae4584b55e23 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -40,7 +40,7 @@
 #include <cppuhelper/compbase6.hxx>
 #include <comphelper/uno3.hxx>
 #include "connectivity/CommonTools.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/broadcasthelper.hxx>
 
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 8bf121e2b20d..1d8a5f02a211 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "odbc/OFunctiondefs.hxx"
 #include "odbc/odbcbasedllapi.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/CommonTools.hxx"
 #include "TConnection.hxx"
 #include "OTypeInfo.hxx"