[Libreoffice-commits] core.git: bridges/source

[Stephan Bergmann]

 bridges/source/jni_uno/jni_bridge.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46bdc500669aa07cad75a2f7f917c7c3f97e21ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:30:13 2015 +0100

    Don't assume sal_Unicode is unsigned short
    
    Change-Id: Ic025383863651f1ab70c4a819737106279d9aa1c

diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index cff6edc..ba4a939 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -323,7 +323,7 @@ void JNI_context::java_exc_occurred() const
         rtl_mem::allocate(
             sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
     rtl_uString * ustr = reinterpret_cast<rtl_uString *>(ustr_mem.get());
-    m_env->GetStringRegion( static_cast<jstring>(jo_descr.get()), 0, len, ustr->buffer );
+    m_env->GetStringRegion( static_cast<jstring>(jo_descr.get()), 0, len, reinterpret_cast<jchar *>(ustr->buffer) );
     if (m_env->ExceptionCheck())
     {
         m_env->ExceptionClear();
@@ -400,7 +400,7 @@ OUString JNI_context::get_stack_trace( jobject jo_exc ) const
                         sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) ) );
                 rtl_uString * ustr = reinterpret_cast<rtl_uString *>(ustr_mem.get());
                 m_env->GetStringRegion(
-                    static_cast<jstring>(jo_stack_trace.get()), 0, len, ustr->buffer );
+                    static_cast<jstring>(jo_stack_trace.get()), 0, len, reinterpret_cast<jchar *>(ustr->buffer) );
                 if (assert_no_exception())
                 {
                     ustr->refCount = 1;