[Libreoffice-commits] core.git: avmedia/source

[Stephan Bergmann]

 avmedia/source/macavf/framegrabber.mm    |    2 +-
 avmedia/source/macavf/player.mm          |    2 +-
 avmedia/source/quicktime/framegrabber.mm |    2 +-
 avmedia/source/quicktime/player.mm       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0ae1c6d120f1dc0555e31e0f4eef09ee7ae46bfd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 17 10:29:50 2015 +0100

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

diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index 7fcf287..bf54b01 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 bbe9bf3..cb366c0 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 9166d86..e3cc480 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 5ef7568..b5cd5f1 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;