User: rt Date: 2008-01-30 07:56:30+0000 Modified: dba/connectivity/source/drivers/macab/MacabConnection.hxx
Log: INTEGRATION: CWS dba24d (1.2.20); FILE MERGED 2008/01/11 10:20:51 oj 1.2.20.3: compile error 2008/01/11 10:13:07 oj 1.2.20.2: compile error 2007/11/21 12:42:02 oj 1.2.20.1: #i68854# impl TypeSettingInfo for Oracle and some clean up File Changes: Directory: /dba/connectivity/source/drivers/macab/ ================================================== File [changed]: MacabConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabConnection.hxx?r1=1.2&r2=1.3 Delta lines: +8 -11 -------------------- --- MacabConnection.hxx 2007-09-13 17:51:38+0000 1.2 +++ MacabConnection.hxx 2008-01-30 07:56:28+0000 1.3 @@ -65,6 +65,7 @@ #ifndef _CPPUHELPER_COMPBASE3_HXX_ #include <cppuhelper/compbase3.hxx> #endif +#include "TConnection.hxx" namespace connectivity { @@ -81,11 +82,12 @@ class MacabDatabaseMetaData; class MacabAddressBook; - typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding + //typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; - class MacabConnection : public comphelper::OBaseMutex, - public MacabConnection_BASE, + typedef connectivity::OMetaConnection MacabConnection_BASE; + + class MacabConnection : public MacabConnection_BASE, public OSubComponent<MacabConnection, MacabConnection_BASE> { friend class OSubComponent<MacabConnection, MacabConnection_BASE>; @@ -94,11 +96,6 @@ //==================================================================== // Data attributes //==================================================================== - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - - OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects - // for this Connection - MacabAddressBook* m_pAddressBook; // the address book MacabDriver* m_pDriver; // pointer to the owning driver object ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
