diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:46:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-30 07:46:12 +0000 |
| commit | 6069bacd79f70c7ad2be4db16e23536329cd9033 (patch) | |
| tree | e938145252f2ac5cc3704a49280435cc46d91249 /dbaccess/source/ui/dlg/odbcconfig.cxx | |
| parent | 11995d10794fadbb19f877196bdc2870ddfc35f7 (diff) | |
INTEGRATION: CWS dba24d (1.22.2); FILE MERGED
2007/11/28 11:19:02 oj 1.22.2.1: #i50435# use system textencoding
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index ceabb41fc5ae..f26b02120c0d 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -4,9 +4,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: obo $ $Date: 2008-01-07 09:49:57 $ + * last change: $Author: rt $ $Date: 2008-01-30 08:46:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -313,10 +313,11 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) 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 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) 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 |