Don't assume sal_Unicode is unsigned short

Change-Id: I82bb9471479523d68641fd815da1208f0d45b8a8

fpicker/source/aqua/CFStringUtilities.mm

@@ -41,13 +41,13 @@ rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
 
     //DBG_PRINT_EXIT("CFStringUtilities", __func__, unichars);
 
-    return rtl::OUString(unichars);
+    return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
 }
 
 CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString) {
     //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
 
-    CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, aString.getStr(), aString.getLength());
+    CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, reinterpret_cast<UniChar const *>(aString.getStr()), aString.getLength());
 
     //DBG_PRINT_EXIT("CFStringUtilities", __func__, ref);
 

fpicker/source/aqua/NSString_OOoAdditions.mm

@@ -28,7 +28,7 @@
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__, "ouString", ouString);
 
-    NSString *string = [[NSString alloc] initWithCharacters:ouString.getStr() length:ouString.getLength()];
+    NSString *string = [[NSString alloc] initWithCharacters:reinterpret_cast<unichar const *>(ouString.getStr()) length:ouString.getLength()];
 
     DBG_PRINT_EXIT(CLASS_NAME, __func__, string);
     return [string autorelease];
@@ -45,7 +45,7 @@
 
     [self getCharacters:unichars];
 
-    return rtl::OUString(unichars);
+    return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
 }
 
 @end