#101798# impl connection sharing

1 files changed, 2 insertions, 92 deletions

diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 3b8bb3f8dfa3..4afdf9c6b635 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ZPooledConnection.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-08-12 08:43:21 $
+ *  last change: $Author: oj $ $Date: 2002-08-12 09:04:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,12 +79,6 @@
 #ifndef _CPPUHELPER_COMPBASE1_HXX_
 #include <cppuhelper/compbase1.hxx>
 #endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
-#include <comphelper/sequence.hxx>
-#endif
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
-#include <cppuhelper/typeprovider.hxx>
-#endif
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -121,90 +115,6 @@ void SAL_CALL OPooledConnection::disposing( const EventObject& Source ) throw (R
 // -----------------------------------------------------------------------------
 namespace connectivity
 {
-    //=====================================================================
-    //= deriving from multiple XInterface-derived classes
-    //=====================================================================
-    //= forwarding/merging XInterface funtionality
-    //=====================================================================
-    #define DECLARE_XINTERFACE( )   \
-        virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); \
-        virtual void SAL_CALL acquire() throw(); \
-        virtual void SAL_CALL release() throw();
-
-    #define IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
-        void SAL_CALL classname::acquire() throw() { refcountbase::acquire(); } \
-        void SAL_CALL classname::release() throw() { refcountbase::release(); }
-
-    #define IMPLEMENT_FORWARD_XINTERFACE2( classname, refcountbase, baseclass2 ) \
-        IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
-        ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { \
-            ::com::sun::star::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
-            if ( !aReturn.hasValue() ) \
-                aReturn = baseclass2::queryInterface( _rType ); \
-            return aReturn; \
-        }
-
-    #define IMPLEMENT_FORWARD_XINTERFACE3( classname, refcountbase, baseclass2, baseclass3 ) \
-        IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \
-        ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { \
-            ::com::sun::star::uno::Any aReturn = refcountbase::queryInterface( _rType ); \
-            if ( !aReturn.hasValue() ) \
-            { \
-                aReturn = baseclass2::queryInterface( _rType ); \
-                if ( !aReturn.hasValue() ) \
-                    aReturn = baseclass3::queryInterface( _rType ); \
-            } \
-            return aReturn; \
-        }
-
-    //=====================================================================
-    //= forwarding/merging XTypeProvider funtionality
-    //=====================================================================
-    #define DECLARE_XTYPEPROVIDER( )    \
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException); \
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException);
-
-    #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \
-        ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException) \
-        { \
-            static ::cppu::OImplementationId* pId = NULL; \
-            if (!pId) \
-            { \
-                ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \
-                if (!pId) \
-                { \
-                    static ::cppu::OImplementationId aId; \
-                    pId = &aId; \
-                } \
-            } \
-            return pId->getImplementationId(); \
-        }
-
-    #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes(  ) throw (::com::sun::star::uno::RuntimeException) \
-        { \
-            return ::comphelper::concatSequences( \
-                baseclass1::getTypes(), \
-                baseclass2::getTypes() \
-            ); \
-        } \
-        \
-        IMPLEMENT_GET_IMPLEMENTATION_ID( classname )
-
-    #define IMPLEMENT_FORWARD_XTYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes(  ) throw (::com::sun::star::uno::RuntimeException) \
-        { \
-            return ::comphelper::concatSequences( \
-                baseclass1::getTypes(), \
-                baseclass2::getTypes(), \
-                baseclass3::getTypes() \
-            ); \
-        } \
-        \
-        IMPLEMENT_GET_IMPLEMENTATION_ID( classname )
-
     using namespace ::cppu;
     typedef ::cppu::WeakComponentImplHelper1< XCloseable > OConnectionWeakWrapper_BASE;
     class OConnectionWeakWrapper :  public ::comphelper::OBaseMutex