User: kz Date: 2006/12/13 08:19:47 Modified: dba/connectivity/source/drivers/mozab/MConnection.cxx
Log: INTEGRATION: CWS dba22ui (1.24.32); FILE MERGED 2006/12/11 09:37:22 fs 1.24.32.2: acquire in dtor, to prevent reentrance 2006/12/04 11:19:13 fs 1.24.32.1: properly recognize invalid LDAP connections / #i71773# STR_COULD_NOT_CONNECT_LDAP File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MConnection.cxx?r1=1.24&r2=1.25 Delta lines: +10 -12 --------------------- --- MConnection.cxx 18 Oct 2006 13:08:12 -0000 1.24 +++ MConnection.cxx 13 Dec 2006 16:19:44 -0000 1.25 @@ -66,6 +66,8 @@ #include "diagnose_ex.h" #endif +#include "resource/mozab_res.hrc" + #ifndef COMPHELPER_OFFICE_RESOURCE_BUNDLE_HXX #include <comphelper/officeresourcebundle.hxx> #endif @@ -167,6 +169,7 @@ //----------------------------------------------------------------------------- OConnection::~OConnection() { + acquire(); if(!isClosed()) close(); m_pDriver->release(); @@ -206,8 +209,7 @@ else { OSL_TRACE( "No subschema given!!!\n"); - ::dbtools::throwGenericSQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("No subschema provided")),NULL); + throwGenericSQLException( STR_URI_SYNTAX_ERROR ); } } else @@ -317,10 +319,8 @@ if ( m_sHostName.getLength() != 0 ) { m_sMozillaURI += m_sHostName; } - else { - ::dbtools::throwGenericSQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("No HostName provided")),NULL); - } + else + throwGenericSQLException( STR_NO_HOSTNAME ); if ( nPortNumber > 0 ) { m_sMozillaURI += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(":") ); @@ -331,10 +331,9 @@ m_sMozillaURI += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ); m_sMozillaURI += sBaseDN; } - else { - ::dbtools::throwGenericSQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("No BaseDN provided")),NULL); - } + else + throwGenericSQLException( STR_NO_BASEDN ); + // Addition of a fake query to enable the Mozilla LDAP directory to work correctly. m_sMozillaURI += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?(or(DisplayName,=,DontDoThisAtHome)))")); @@ -350,8 +349,7 @@ else { OSL_TRACE("Invalid subschema given!!!\n"); - ::dbtools::throwGenericSQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Invalid subschema provided")),NULL); + throwGenericSQLException( STR_URI_SYNTAX_ERROR ); } OSL_TRACE("Moz URI = %s, %s\n", ((OUtoCStr(m_sMozillaURI)) ? (OUtoCStr(m_sMozillaURI)):("NULL")), usesFactory() ? "uses factory" : "no factory"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
