Tag: cws_src680_sb83 User: sb Date: 2008-02-01 13:27:20+0000 Removed: dba/dbaccess/source/inc/dba_reghelper.hxx dba/dbaccess/source/shared/dba_reghelper.cxx
Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx Log: RESYNC:; FILE REMOVED File Changes: Directory: /dba/dbaccess/source/inc/ ==================================== File [removed]: dba_reghelper.hxx Directory: /dba/dbaccess/source/shared/ ======================================= File [removed]: dba_reghelper.cxx 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.16.1&r2=1.22.16.2 Delta lines: +8 -7 ------------------- --- odbcconfig.cxx 2007-11-22 09:41:51+0000 1.22.16.1 +++ odbcconfig.cxx 2008-02-01 13:26:51+0000 1.22.16.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]
