diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:57:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:57:44 +0000 |
| commit | d80acf8a8e46e678c9ab3ba165bde66d05016bfb (patch) | |
| tree | 5ed30547ee70fae5b4e2231825982e05a3f378a0 /connectivity | |
| parent | 239e5f4d7c178462752210f7afc2f7376d4366b7 (diff) | |
INTEGRATION: CWS dba22c (1.20.10); FILE MERGED
2007/01/14 21:00:24 fs 1.20.10.1: #i73451# missing placeholer in resource, fixing code only for 2.2, fixing resource for later builds
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 0d8617b0c921..70c5e80a8af0 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dbtools2.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2006-12-13 16:14:09 $ + * last change: $Author: obo $ $Date: 2007-01-25 11:57:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -882,7 +882,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc SharedResources aResources; ::rtl::OUString sMessage = aResources.getResourceStringWithSubstitution( STR_CANNOT_CONVERT_STRING, "$string$", _rSource, - "$charset$", lcl_getEncodingName( _eEncoding ) + "$charset", lcl_getEncodingName( _eEncoding ) ); throw SQLException( |