Tag: mws_ooh680 User: kz Date: 2008-01-18 15:51:28+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: INTEGRATION: CWS dba24d_OOH680 (1.22.2); FILE MERGED 2007/11/28 11:19:02 oj 1.22.2.1: #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.34.1&r2=1.22.34.2 Delta lines: +5 -4 ------------------- --- odbcconfig.cxx 2008-01-02 14:39:39+0000 1.22.34.1 +++ odbcconfig.cxx 2008-01-18 15:51:25+0000 1.22.34.2 @@ -313,10 +313,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) @@ -324,8 +325,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]
