Tag: cws_src680_dba24d User: oj Date: 2007-11-28 11:19:04+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: #i50435# use system textencoding File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.cxx?r1=1.22&r2=1.22.2.1 Delta lines: +8 -7 ------------------- --- odbcconfig.cxx 2007-11-02 12:22:06+0000 1.22 +++ odbcconfig.cxx 2007-11-28 11:19:02+0000 1.22.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/02 12:22:06 $ + * last change: $Author: oj $ $Date: 2007/11/28 11:19:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -318,10 +318,11 @@ UCHAR szDescription[1024+1]; SWORD pcbDescription; SQLRETURN nResult = SQL_SUCCESS; + rtl_TextEncoding nTextEncoding = osl_getThreadTextEncoding(); - for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription), &pcbDescription); + for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription); ; - nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription), &pcbDescription) + nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription) ) { if (nResult != SQL_SUCCESS) @@ -329,8 +330,8 @@ break; else { - ::rtl::OUStringBuffer aCurrentDsn; aCurrentDsn.appendAscii(reinterpret_cast<const char*>(szDSN)); - _rNames.insert(aCurrentDsn.makeStringAndClear()); + ::rtl::OUString aCurrentDsn(reinterpret_cast<const char*>(szDSN),pcbDSN, nTextEncoding); + _rNames.insert(aCurrentDsn); } } #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
