mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't assume sal_Unicode is unsigned short

Browse Source 
Change-Id: I083a33e71d1bb9fcef3b287e1db15910779312ab
This commit is contained in:
Stephan Bergmann
2015-11-17 10:38:44 +01:00
parent 0b8a21a33a
commit 6a8a84c72f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javaunohelper/source/bootstrap.cxx
View File

@@ -53,7 +53,7 @@ inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
jsize len = jni_env->GetStringLength( jstr ); jsize len = jni_env->GetStringLength( jstr );
rtl_uString * ustr = rtl_uString * ustr =
static_cast<rtl_uString *>(rtl_allocateMemory( sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) )); static_cast<rtl_uString *>(rtl_allocateMemory( sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ));
jni_env->GetStringRegion( jstr, 0, len, ustr->buffer ); jni_env->GetStringRegion( jstr, 0, len, reinterpret_cast<jchar *>(ustr->buffer) );
OSL_ASSERT( !jni_env->ExceptionCheck() ); OSL_ASSERT( !jni_env->ExceptionCheck() );
ustr->refCount = 1; ustr->refCount = 1;
ustr->length = len; ustr->length = len;

4
javaunohelper/source/javaunohelper.cxx
View File

@@ -56,7 +56,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
bool bRet = false; bool bRet = false;
const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr); const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr);
OUString aLibName(pJLibName); OUString aLibName(reinterpret_cast<sal_Unicode const *>(pJLibName));
pJEnv->ReleaseStringChars(jLibName, pJLibName); pJEnv->ReleaseStringChars(jLibName, pJLibName);
#ifdef DISABLE_DYNLOADING #ifdef DISABLE_DYNLOADING
@@ -138,7 +138,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
jobject jSMgr, jobject jRegKey, jobject loader ) jobject jSMgr, jobject jRegKey, jobject loader )
{ {
const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr); const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr);
OUString aLibName(pJLibName); OUString aLibName(reinterpret_cast<sal_Unicode const *>(pJLibName));
pJEnv->ReleaseStringChars(jLibName, pJLibName); pJEnv->ReleaseStringChars(jLibName, pJLibName);
#ifdef DISABLE_DYNLOADING #ifdef DISABLE_DYNLOADING