User: rt Date: 05/10/24 01:21:28 Modified: /dba/connectivity/source/drivers/hsqldb/ HStorageMap.cxx
Log: INTEGRATION: CWS dba201d (1.8.10); FILE MERGED 2005/09/27 08:12:34 oj 1.8.10.1: commits from dba201c File Changes: Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: HStorageMap.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HStorageMap.cxx?r1=1.8&r2=1.9 Delta lines: +13 -6 -------------------- --- HStorageMap.cxx 8 Sep 2005 06:04:08 -0000 1.8 +++ HStorageMap.cxx 24 Oct 2005 08:21:25 -0000 1.9 @@ -170,22 +170,29 @@ ::rtl::OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr) { - const char * cstr; - rtl_uString * ustr = NULL; - cstr = env->GetStringUTFChars(jstr, NULL); if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); OSL_ENSURE(0,"ExceptionClear"); } - rtl_uString_newFromAscii(&ustr, cstr); - env->ReleaseStringUTFChars(jstr, cstr); + ::rtl::OUString aStr; + if ( jstr ) + { + jboolean bCopy(sal_True); + const jchar* pChar = env->GetStringChars(jstr,&bCopy); + jsize len = env->GetStringLength(jstr); + aStr = ::rtl::OUString(pChar,len); + + if(bCopy) + env->ReleaseStringChars(jstr,pChar); + } + if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); OSL_ENSURE(0,"ExceptionClear"); } - return ustr ? ::rtl::OUString(ustr,SAL_NO_ACQUIRE) : ::rtl::OUString(); + return aStr; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
