User: obo Date: 2007-06-12 05:27:15+0000 Modified: dba/connectivity/source/commontools/dbtools2.cxx
Log: INTEGRATION: CWS dba23ui (1.20.30); FILE MERGED 2007/05/19 20:49:35 fs 1.20.30.2: RESYNC: (1.20-1.22); FILE MERGED 2007/01/14 21:09:02 fs 1.20.30.1: dummy change to provoke conflict on resync, the surviving change should be '$charset$', not '$charset' File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools2.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools2.cxx?r1=1.22&r2=1.23 Delta lines: +1 -1 ------------------- --- dbtools2.cxx 2007-05-09 13:22:29+0000 1.22 +++ dbtools2.cxx 2007-06-12 05:27:13+0000 1.23 @@ -882,7 +882,7 @@ SharedResources aResources; ::rtl::OUString sMessage = aResources.getResourceStringWithSubstitution( STR_CANNOT_CONVERT_STRING, "$string$", _rSource, - "$charset", lcl_getEncodingName( _eEncoding ) + "$charset$", lcl_getEncodingName( _eEncoding ) ); throw SQLException( --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
