User: ihi Date: 2007-11-21 15:44:56+0000 Modified: dba/dbaccess/source/sdbtools/connection/connectiondependent.hxx
Log: INTEGRATION: CWS dba24c (1.2.184); FILE MERGED 2007/09/20 18:35:33 fs 1.2.184.1: #i80856# some error strings now taken from ::connectivity::SQLError, using the new css.sdb.ErrorCondition File Changes: Directory: /dba/dbaccess/source/sdbtools/connection/ ==================================================== File [changed]: connectiondependent.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/sdbtools/connection/connectiondependent.hxx?r1=1.2&r2=1.3 Delta lines: +14 -14 --------------------- --- connectiondependent.hxx 2006-07-10 15:18:38+0000 1.2 +++ connectiondependent.hxx 2007-11-21 15:44:53+0000 1.3 @@ -37,21 +37,13 @@ #define DBACCESS_CONNECTION_DEPENDENT_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif /** === end UNO includes === **/ -#ifndef _OSL_MUTEX_HXX_ -#include <osl/mutex.hxx> -#endif - -#ifndef _CPPUHELPER_WEAKREF_HXX_ +#include <comphelper/componentcontext.hxx> #include <cppuhelper/weakref.hxx> -#endif +#include <osl/mutex.hxx> //........................................................................ namespace sdbtools @@ -67,6 +59,8 @@ mutable ::osl::Mutex m_aMutex; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_aConnection; + ::comphelper::ComponentContext + m_aContext; /** a hard reference to the connection we're working for @@ -80,11 +74,17 @@ protected: ::osl::Mutex& getMutex() const { return m_aMutex; } + const ::comphelper::ComponentContext& + getContext() const { return m_aContext; } + protected: class EntryGuard; protected: - ConnectionDependentComponent() { } + ConnectionDependentComponent( const ::comphelper::ComponentContext& _rContext ) + :m_aContext( _rContext ) + { + } /** sets the connection we depend on. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
