User: rt Date: 2008-06-06 13:23:58+0000 Modified: dba/connectivity/source/drivers/odbc/OConnection.cxx
Log: INTEGRATION: CWS dba30c (1.44.10); FILE MERGED 2008/05/14 06:06:30 oj 1.44.10.1: #i89322# disable login timeout for macos due to an error in iodbc File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OConnection.cxx?r1=1.44&r2=1.45 Delta lines: +2 -1 ------------------- --- OConnection.cxx 2008-04-10 10:26:05+0000 1.44 +++ OConnection.cxx 2008-06-06 13:23:55+0000 1.45 @@ -114,9 +114,10 @@ ::rtl::OString aConStr(::rtl::OUStringToOString(aConnectStr,getTextEncoding())); memcpy(szConnStrIn, (SDB_ODBC_CHAR*) aConStr.getStr(), ::std::min<sal_Int32>((sal_Int32)2048,aConStr.getLength())); - +#ifndef MACOSX N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_LOGIN_TIMEOUT,(SQLPOINTER)nTimeOut,SQL_IS_UINTEGER); // Verbindung aufbauen +#endif #ifdef LINUX OSL_UNUSED( bSilent ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
