Tag: cws_src680_dba24d User: oj Date: 2008-01-11 10:13:10+0000 Modified: dba/connectivity/source/drivers/macab/MacabConnection.cxx dba/connectivity/source/drivers/macab/MacabConnection.hxx
Log: compile error File Changes: Directory: /dba/connectivity/source/drivers/macab/ ================================================== File [changed]: MacabConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabConnection.cxx?r1=1.2&r2=1.2.20.1 Delta lines: +2 -3 ------------------- --- MacabConnection.cxx 2007-09-13 17:51:21+0000 1.2 +++ MacabConnection.cxx 2008-01-11 10:13:07+0000 1.2.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: MacabConnection.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.20.1 $ * - * last change: $Author: ihi $ $Date: 2007/09/13 17:51:21 $ + * last change: $Author: oj $ $Date: 2008/01/11 10:13:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,6 @@ MacabConnection::MacabConnection(MacabDriver* _pDriver) : OMetaConnection_BASE(m_aMutex), OSubComponent<MacabConnection, MacabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), - m_xMetaData(NULL), m_pAddressBook(NULL), m_pDriver(_pDriver) { File [changed]: MacabConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabConnection.hxx?r1=1.2.20.1&r2=1.2.20.2 Delta lines: +6 -8 ------------------- --- MacabConnection.hxx 2007-11-21 12:42:02+0000 1.2.20.1 +++ MacabConnection.hxx 2008-01-11 10:13:07+0000 1.2.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: MacabConnection.hxx,v $ * - * $Revision: 1.2.20.1 $ + * $Revision: 1.2.20.2 $ * - * last change: $Author: oj $ $Date: 2007/11/21 12:42:02 $ + * last change: $Author: oj $ $Date: 2008/01/11 10:13:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,11 +81,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,9 +95,6 @@ //==================================================================== // Data attributes //==================================================================== - 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]
