diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:38:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:38:44 +0100 |
| commit | 6a8a84c72f89930094870df1ed2a65bfe5768a44 (patch) | |
| tree | 7834237faf3e871f614d8db30fcce3422e93bf62 /javaunohelper | |
| parent | 0b8a21a33a3d751b885c964853f73afde18632e9 (diff) | |
Don't assume sal_Unicode is unsigned short
Change-Id: I083a33e71d1bb9fcef3b287e1db15910779312ab
Diffstat (limited to 'javaunohelper')
| -rw-r--r-- | javaunohelper/source/bootstrap.cxx | 2 | ||||
| -rw-r--r-- | javaunohelper/source/javaunohelper.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx index ac3b59603604..e245ecc174e6 100644 --- a/javaunohelper/source/bootstrap.cxx +++ b/javaunohelper/source/bootstrap.cxx @@ -53,7 +53,7 @@ inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env ) jsize len = jni_env->GetStringLength( jstr ); rtl_uString * ustr = 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() ); ustr->refCount = 1; ustr->length = len; diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx index 83c9643c3d4d..d18979b7381d 100644 --- a/javaunohelper/source/javaunohelper.cxx +++ b/javaunohelper/source/javaunohelper.cxx @@ -56,7 +56,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo( bool bRet = false; const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr); - OUString aLibName(pJLibName); + OUString aLibName(reinterpret_cast<sal_Unicode const *>(pJLibName)); pJEnv->ReleaseStringChars(jLibName, pJLibName); #ifdef DISABLE_DYNLOADING @@ -138,7 +138,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory( jobject jSMgr, jobject jRegKey, jobject loader ) { const jchar* pJLibName = pJEnv->GetStringChars(jLibName, nullptr); - OUString aLibName(pJLibName); + OUString aLibName(reinterpret_cast<sal_Unicode const *>(pJLibName)); pJEnv->ReleaseStringChars(jLibName, pJLibName); #ifdef DISABLE_DYNLOADING |