User: vg      
Date: 05/02/16 07:56:00

Modified:
 /dba/connectivity/source/inc/hsqldb/
  HDriver.hxx

Log:
 INTEGRATION: CWS hsqldb2 (1.2.20); FILE MERGED
 2005/01/28 12:21:19 oj 1.2.20.2: #i39922# new interfaces in hsqldb
 2005/01/19 07:03:57 oj 1.2.20.1: #i39922# remove db from stream name

File Changes:

Directory: /dba/connectivity/source/inc/hsqldb/
===============================================

File [changed]: HDriver.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/hsqldb/HDriver.hxx?r1=1.3&r2=1.4
Delta lines:  +19 -6
--------------------
--- HDriver.hxx 21 Jan 2005 16:43:38 -0000      1.3
+++ HDriver.hxx 16 Feb 2005 15:55:57 -0000      1.4
@@ -70,12 +70,12 @@
 #ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_
 #include <com/sun/star/sdbcx/XCreateCatalog.hpp>
 #endif
+#ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_
+#include <com/sun/star/embed/XTransactionListener.hpp>
+#endif
 #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #endif
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_
-#include <com/sun/star/lang/XEventListener.hpp>
-#endif
 #ifndef _CPPUHELPER_COMPBASE5_HXX_
 #include <cppuhelper/compbase5.hxx>
 #endif
@@ -106,11 +106,11 @@
                typedef ::cppu::WeakComponentImplHelper5<       
::com::sun::star::sdbc::XDriver
                                                                                
,::com::sun::star::sdbcx::XDataDefinitionSupplier
                                                                                
, ::com::sun::star::lang::XServiceInfo
-                                                                               
, ::com::sun::star::lang::XEventListener
-                                                                               
,::com::sun::star::sdbcx::XCreateCatalog
+                                                                               
, ::com::sun::star::sdbcx::XCreateCatalog
+                                        , 
::com::sun::star::embed::XTransactionListener
                                                                                
>       ODriverDelegator_BASE;
 
-               typedef ::std::pair< ::rtl::OUString ,OMetaConnection*> 
TWeakConnectionPair;
+               typedef ::std::pair< ::rtl::OUString 
,::com::sun::star::uno::WeakReferenceHelper > TWeakConnectionPair;
                typedef ::std::pair< 
::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair;
                typedef ::std::vector< TWeakPair > TWeakPairVector;
                
@@ -126,6 +126,7 @@
                                                                                
                                                                                
                                //  for this Driver
                        ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDriver >                                     m_xDriver;
                        ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >        m_xFactory;
+            sal_Bool                                                           
                 m_bInShutDownConnections;
 
                        /** load the driver we want to delegate.
                                The <member>m_xDriver</member> may be <NULL/> 
if the driver could not be loaded.
@@ -134,6 +135,12 @@
                        */
                        ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDriver > loadDriver( );
 
+            /** shut down the connection and revoke the storage from the map
+                @param  _aIter
+                    The connection to shut down and storage to revoke.
+            */
+            void shutdownConnection(const TWeakPairVector::iterator& _aIter);
+
                public:
                        /** creates a new delegator for a HSQLDB driver
                        */
@@ -160,6 +167,12 @@
 
                        // XEventListener
                        virtual void SAL_CALL disposing( const 
::com::sun::star::lang::EventObject& Source ) 
throw(::com::sun::star::uno::RuntimeException);
+
+            // XTransactionListener
+            virtual void SAL_CALL preCommit( const 
::com::sun::star::lang::EventObject& aEvent ) throw 
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL commited( const 
::com::sun::star::lang::EventObject& aEvent ) throw 
(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL preRevert( const 
::com::sun::star::lang::EventObject& aEvent ) throw 
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL reverted( const 
::com::sun::star::lang::EventObject& aEvent ) throw 
(::com::sun::star::uno::RuntimeException);
 
             void shutdownConnections();
                protected:




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to