[Libreoffice-commits] core.git: 2 commits - jvmaccess/source jvmfwk/plugins

[Stephan Bergmann]

 jvmaccess/source/classpath.cxx                  |    2 +-
 jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be59130fa477b6c5c7abbee121fdf9eb261b8312
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:39:20 2015 +0100

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

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
index 45ba2dd..5755d4c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
@@ -18,7 +18,7 @@ bool JvmfwkUtil_isLoadableJVM( OUString const & aURL )
     {
         NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
-        NSString *pString = [NSString stringWithCharacters:aURL.getStr() length:aURL.getLength()];
+        NSString *pString = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(aURL.getStr()) length:aURL.getLength()];
         if ( pString )
         {
             NSURL *pURL = nil;
commit 3f448be5d894438c1293468ed13523222119b54f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:39:06 2015 +0100

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

diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 3f0a3e3..6b4436a 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -74,7 +74,7 @@ jobjectArray jvmaccess::ClassPath::translateToUrls(
             }
             jvalue arg;
             arg.l = environment->NewString(
-                static_cast< jchar const * >(url.getStr()),
+                reinterpret_cast< jchar const * >(url.getStr()),
                 static_cast< jsize >(url.getLength()));
             if (arg.l == nullptr) {
                 return nullptr;