diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:23:55 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 12:23:55 +0000 |
commit | 631783f454b4a44d89f75137139e38378dc0f909 (patch) | |
tree | 0cde3068cad1228b6582ed43ce261ec86bf4225a /connectivity/source | |
parent | ef8d844f9e0ce92729ccb531231b7756a78f84ad (diff) |
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
Diffstat (limited to 'connectivity/source')
-rw-r--r-- | connectivity/source/drivers/odbc/OConnection.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index fe7f88ec3667..40a14531553c 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OConnection.cxx,v $ - * $Revision: 1.44 $ + * $Revision: 1.45 $ * * This file is part of OpenOffice.org. * @@ -114,9 +114,10 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int ::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 ); |