diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:29:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-17 10:29:50 +0100 |
| commit | 0ae1c6d120f1dc0555e31e0f4eef09ee7ae46bfd (patch) | |
| tree | 0300384f32abca9e29a733ca23f76666c33177b4 /avmedia | |
| parent | c830aa640104317f951b9e470bde9bc66ed627a5 (diff) | |
Don't assume sal_Unicode is unsigned short
Change-Id: I7fcaa4e86f264182db7f4e46c2388402f801531a
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/macavf/player.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/framegrabber.mm | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/player.mm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 7fcf287fd58f..bf54b01e042b 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -49,7 +49,7 @@ FrameGrabber::~FrameGrabber() bool FrameGrabber::create( const ::rtl::OUString& rURL ) { - NSString* pNSStr = [NSString stringWithCharacters:rURL.getStr() length:rURL.getLength()]; + NSString* pNSStr = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(rURL.getStr()) length:rURL.getLength()]; SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.11 stringByAddingPercentEscapesUsingEncoding NSURL* pNSURL = [NSURL URLWithString: [pNSStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index bbe9bf373e09..cb366c0bb12c 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -122,7 +122,7 @@ bool Player::handleObservation( NSString* pKeyPath ) bool Player::create( const ::rtl::OUString& rURL ) { // get the media asset - NSString* aNSStr = [NSString stringWithCharacters:rURL.getStr() length:rURL.getLength()]; + NSString* aNSStr = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(rURL.getStr()) length:rURL.getLength()]; SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.11 stringByAddingPercentEscapesUsingEncoding NSURL* aNSURL = [NSURL URLWithString: [aNSStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 9166d860c20c..e3cc4809bccb 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -69,7 +69,7 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL ) bool bRet = false; maURL = rURL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ; + NSString* aNSStr = [[[NSString alloc] initWithCharacters: reinterpret_cast<unichar const *>(rURL.getStr()) length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ; NSURL* aURL = [NSURL URLWithString:aNSStr ]; // create the Movie diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index 5ef7568da3a8..b5cd5f1e4df1 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -84,7 +84,7 @@ bool Player::create( const ::rtl::OUString& rURL ) mpMovie = nil; } - NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ; + NSString* aNSStr = [[[NSString alloc] initWithCharacters: reinterpret_cast<unichar const *>(rURL.getStr()) length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ; NSURL* aURL = [NSURL URLWithString:aNSStr ]; NSError* pErr = nil; |