User: obo Date: 06/03/29 04:17:29 Modified: /dba/connectivity/source/drivers/mozab/ MConnection.hxx
Log: INTEGRATION: CWS dba203a (1.13.76); FILE MERGED 2006/03/20 13:44:47 fs 1.13.76.2: #i10000# unxlngi6's boost requires RTTI for boost::shared_ptr, which is disabled in mozillasrc sub folder -> move the usage to an impl-structure, away from the declaration in the header 2006/03/17 15:37:55 fs 1.13.76.1: #i60163# localized error messages File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.hxx?r1=1.13&r2=1.14 Delta lines: +9 -0 ------------------- --- MConnection.hxx 8 Sep 2005 06:17:42 -0000 1.13 +++ MConnection.hxx 29 Mar 2006 12:17:27 -0000 1.14 @@ -70,6 +70,8 @@ #include <com/sun/star/mozilla/MozillaProductType.hpp> #endif +#include <memory> + namespace connectivity { namespace mozab @@ -107,6 +109,7 @@ typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding + struct ConnectionImplData; class OConnection : public OConnection_BASE, public connectivity::OSubComponent<OConnection, OConnection_BASE> { @@ -126,6 +129,10 @@ // an operation MozabDriver* m_pDriver; // Pointer to the owning // driver object + ::std::auto_ptr< ConnectionImplData > m_pImplData; + // This is to be able to hold a boost::shared_ptr. If we would hold it as member, it would + // not compile the mozillasrc directory, since this directory is compiled without RTTI support + // and boost seems to require RTTI on some platforms. // Store Catalog ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; // Start of Additions from the land of mozilla @@ -204,6 +211,8 @@ return ::com::sun::star::mozilla::MozillaProductType_Thunderbird; return ::com::sun::star::mozilla::MozillaProductType_Mozilla; } + + void throwGenericSQLException( sal_Int32 _nErrorResourceId ); // Get Ldap BindDN (user name) rtl::OUString getBindDN() const { return m_sBindDN; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
