diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-29 11:17:27 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-29 11:17:27 +0000 |
| commit | 689a2af5d863518a0de93f4bc957a4b62a37a15d (patch) | |
| tree | 8d4341f8da432b5d42a702d65c6ab04d5ec45bee /connectivity | |
| parent | 5ab534a3bb5545f3d14860af49cf2a7bdafceb0e (diff) | |
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
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/MConnection.hxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 6bd9de2f9301..e9fb157f5670 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -4,9 +4,9 @@ * * $RCSfile: MConnection.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-08 06:17:42 $ + * last change: $Author: obo $ $Date: 2006-03-29 12:17:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,6 +70,8 @@ #include <com/sun/star/mozilla/MozillaProductType.hpp> #endif +#include <memory> + namespace connectivity { namespace mozab @@ -107,6 +109,7 @@ namespace connectivity 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 @@ namespace connectivity // 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 @@ -205,6 +212,8 @@ namespace connectivity return ::com::sun::star::mozilla::MozillaProductType_Mozilla; } + void throwGenericSQLException( sal_Int32 _nErrorResourceId ); + // Get Ldap BindDN (user name) rtl::OUString getBindDN() const { return m_sBindDN; } // Get Ldap Password |