summaryrefslogtreecommitdiff
path: root/connectivity/source/cpool/ZPooledConnection.cxx
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2002-08-23 08:41:20 +0000
committerOcke Janssen <oj@openoffice.org>2002-08-23 08:41:20 +0000
commit0d3c9755a60f267a2151b94d8305cd2be89e0a1c (patch)
treebd61d047a9bd647e19af13c0c315be771927ef33 /connectivity/source/cpool/ZPooledConnection.cxx
parent6f2a379fc252ab890fd1bfd49de98d9c0bc897b0 (diff)
#101798# impl WeakConnectionWrapper
Diffstat (limited to 'connectivity/source/cpool/ZPooledConnection.cxx')
-rw-r--r--connectivity/source/cpool/ZPooledConnection.cxx42
1 files changed, 5 insertions, 37 deletions
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 49b4c1bfa9f0..446464234413 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZPooledConnection.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2002-08-15 15:17:39 $
+ * last change: $Author: oj $ $Date: 2002-08-23 09:41:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,6 +61,9 @@
#ifndef CONNECTIVITY_POOLEDCONNECTION_HXX
#include "ZPooledConnection.hxx"
#endif
+#ifndef _CONNECTIVITY_ZCONNECTIONWEAKWRAPPER_HXX_
+#include "ZConnectionWrapper.hxx"
+#endif
#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
#include "connectivity/ConnectionWrapper.hxx"
#endif
@@ -113,41 +116,6 @@ void SAL_CALL OPooledConnection::disposing( const EventObject& Source ) throw (R
m_xComponent = NULL;
}
// -----------------------------------------------------------------------------
-namespace connectivity
-{
- using namespace ::cppu;
- typedef ::cppu::WeakComponentImplHelper1< XCloseable > OConnectionWeakWrapper_BASE;
- class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
- , public OConnectionWeakWrapper_BASE
- , public OConnectionWrapper
- {
- public:
- OConnectionWeakWrapper(Reference< XAggregation >& _xConnection)
- : OConnectionWeakWrapper_BASE(m_aMutex)
- ,OConnectionWrapper()
- {
- setDelegation(_xConnection,m_refCount);
- }
- DECLARE_XINTERFACE()
- DECLARE_XTYPEPROVIDER( )
- // --------------------------------------------------------------------------------
- // XCloseable
- void SAL_CALL close( ) throw(SQLException, RuntimeException)
- {
- {
- ::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(rBHelper.bDisposed);
-
- }
- dispose();
- }
-
- };
-
- IMPLEMENT_FORWARD_XINTERFACE2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper)
- IMPLEMENT_FORWARD_XTYPEPROVIDER2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper)
-}
-// -----------------------------------------------------------------------------
//XPooledConnection
Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, RuntimeException)
{