[Libreoffice-commits] core.git: sal/osl

[Stephan Bergmann]

 sal/osl/unx/osxlocale.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

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

diff --git a/sal/osl/unx/osxlocale.cxx b/sal/osl/unx/osxlocale.cxx
index fecb2dc..6f4f028 100644
--- a/sal/osl/unx/osxlocale.cxx
+++ b/sal/osl/unx/osxlocale.cxx
@@ -65,7 +65,8 @@ namespace
     void append(rtl::OUStringBuffer & buffer, CFStringRef string) {
         CFIndex n = CFStringGetLength(string);
         CFStringGetCharacters(
-            string, CFRangeMake(0, n), buffer.appendUninitialized(n));
+            string, CFRangeMake(0, n),
+            reinterpret_cast<UniChar *>(buffer.appendUninitialized(n)));
     }
 }