[Libreoffice-commits] core.git: 2 commits - sfx2/source shell/source

[Stephan Bergmann]

 sfx2/source/appl/shutdowniconaqua.mm      |    2 +-
 shell/source/backends/macbe/macbackend.mm |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ceeeb48f15ef638a778f7d8184df8933f3a870c8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:41:21 2015 +0100

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

diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index 4cfd060..458446f 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -197,7 +197,8 @@ rtl::OUString GetOUString( NSString* pStr )
 
     rtl::OUStringBuffer aBuf( nLen+1 );
     aBuf.setLength( nLen );
-    [pStr getCharacters: const_cast<sal_Unicode*>(aBuf.getStr())];
+    [pStr getCharacters:
+     reinterpret_cast<unichar *>(const_cast<sal_Unicode*>(aBuf.getStr()))];
     return aBuf.makeStringAndClear();
 }
 
commit dccb9677482522d7f6f8a3d807af26049585b7fc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:41:10 2015 +0100

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

diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index dc1600b..031a9ec 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -118,7 +118,7 @@ static std::set< OUString > aShortcuts;
 
 static NSString* getAutoreleasedString( const rtl::OUString& rStr )
 {
-    return [[[NSString alloc] initWithCharacters: rStr.getStr() length: rStr.getLength()] autorelease];
+    return [[[NSString alloc] initWithCharacters: reinterpret_cast<unichar const *>(rStr.getStr()) length: rStr.getLength()] autorelease];
 }
 
 struct RecentMenuEntry