diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:37:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:37:05 +0100 |
| commit | f199bbafd3cbe186b71e806557dca3b1cbcbe430 (patch) | |
| tree | 8569e3740479502c3ed45ee84bcb01a339e84edd /fpicker/source/aqua | |
| parent | e22a16a3b9aa127f6e2bc2c5b893d7527ceab21c (diff) | |
Don't assume sal_Unicode is unsigned short
Change-Id: I82bb9471479523d68641fd815da1208f0d45b8a8
Diffstat (limited to 'fpicker/source/aqua')
| -rw-r--r-- | fpicker/source/aqua/CFStringUtilities.mm | 4 | ||||
| -rw-r--r-- | fpicker/source/aqua/NSString_OOoAdditions.mm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm index 464fbfa75ef9..ead151e36c0c 100644 --- a/fpicker/source/aqua/CFStringUtilities.mm +++ b/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); diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm index 5b4263aeb392..7b7a891ec183 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.mm +++ b/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 |