User: kz      
Date: 2006/12/13 08:16:26

Modified:
   dba/connectivity/source/drivers/dbase/DTable.cxx

Log:
 INTEGRATION: CWS dba22ui (1.98.20); FILE MERGED
 2006/12/03 20:36:21 fs 1.98.20.2: RESYNC: (1.98-1.99); FILE MERGED
 2006/10/25 10:45:32 fs 1.98.20.1: when writing VARCHARs, care for too-long 
strings
 Issue number:  #i62664#
 Submitted by:  [EMAIL PROTECTED]
 Reviewed by:   [EMAIL PROTECTED]

File Changes:

Directory: /dba/connectivity/source/drivers/dbase/
==================================================

File [changed]: DTable.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DTable.cxx?r1=1.99&r2=1.100
Delta lines:  +2 -2
-------------------
--- DTable.cxx  21 Nov 2006 16:59:57 -0000      1.99
+++ DTable.cxx  13 Dec 2006 16:16:24 -0000      1.100
@@ -1653,8 +1653,8 @@
 
                     // convert the string, using the connection's encoding
                     ::rtl::OString sEncoded;
-                    DBTypeConversion::convertUnicodeString( sStringToWrite, 
sEncoded, getConnection()->getTextEncoding() );
-                    memcpy( pData, sEncoded.getStr(), ::std::min( nLen, 
sEncoded.getLength() ) );
+                    DBTypeConversion::convertUnicodeStringToLength( 
sStringToWrite, sEncoded, nLen, getConnection()->getTextEncoding() );
+                    memcpy( pData, sEncoded.getStr(), sEncoded.getLength() );
 
                                }
                 break;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to