remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals.

Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

19 files changed, 81 insertions, 81 deletions

diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx
index 9d9d436b042a..2bcd5011497c 100644
--- a/avmedia/source/macavf/framegrabber.hxx
+++ b/avmedia/source/macavf/framegrabber.hxx
@@ -41,9 +41,9 @@ public:
     virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
 private:
 
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index fc9ef1e1cdaf..f6872e30c317 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -86,17 +86,17 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
 }
 
 
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
+OUString SAL_CALL FrameGrabber::getImplementationName(  )
 {
-    return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
+    return OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
 {
     return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
+uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
 {
     return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/macavf/macavfuno.mm b/avmedia/source/macavf/macavfuno.mm
index c10ad73d22dd..60435b8337a3 100644
--- a/avmedia/source/macavf/macavfuno.mm
+++ b/avmedia/source/macavf/macavfuno.mm
@@ -35,12 +35,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* avmediaMacAVF_component_getFactory( const
 
     if( rtl_str_compare( pImplName, AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) == 0 )
     {
-        const ::rtl::OUString aServiceName( AVMEDIA_MACAVF_MANAGER_SERVICENAME );
+        const OUString aServiceName( AVMEDIA_MACAVF_MANAGER_SERVICENAME );
 
         xFactory.set( ::cppu::createSingleFactory(
                         static_cast< lang::XMultiServiceFactory* >( pServiceManager ),
                         AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME,
-                        create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+                        create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) );
     }
 
     if( xFactory.is() )
diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx
index e20385725988..9f8f6da2f59d 100644
--- a/avmedia/source/macavf/manager.hxx
+++ b/avmedia/source/macavf/manager.hxx
@@ -37,12 +37,12 @@ public:
     virtual ~Manager() override;
 
     // XManager
-    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) override;
+    virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 private:
 
     css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 69d2a3c0196f..a932549ea618 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -36,7 +36,7 @@ Manager::~Manager()
 {}
 
 
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
 {
     Player*                             pPlayer( new Player( mxMgr ) );
     uno::Reference< media::XPlayer >    xRet( pPlayer );
@@ -49,19 +49,19 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
 }
 
 
-::rtl::OUString SAL_CALL Manager::getImplementationName(  )
+OUString SAL_CALL Manager::getImplementationName(  )
 {
-    return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
+    return OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
 }
 
 
-sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
 {
     return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME;
 }
 
 
-uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames(  )
 {
     return { AVMEDIA_MACAVF_MANAGER_SERVICENAME };
 }
diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx
index 47a62aa56971..99b79b843459 100644
--- a/avmedia/source/macavf/player.hxx
+++ b/avmedia/source/macavf/player.hxx
@@ -37,7 +37,7 @@ public:
     explicit Player( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
     virtual  ~Player() override;
 
-    bool create( const ::rtl::OUString& rURL );
+    bool create( const OUString& rURL );
     bool create( AVAsset* );
 
     // XPlayer
@@ -61,9 +61,9 @@ public:
     virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
     virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) override;
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     AVPlayer* getAVPlayer() const { return mpPlayer; }
     virtual bool handleObservation( NSString* pKeyPath ) override;
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 1d51ca276474..ea7e48711861 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -108,7 +108,7 @@ bool Player::handleObservation( NSString* pKeyPath )
 }
 
 
-bool Player::create( const ::rtl::OUString& rURL )
+bool Player::create( const OUString& rURL )
 {
     // get the media asset
     NSString* aNSStr = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(rURL.getStr()) length:rURL.getLength()];
@@ -342,19 +342,19 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber()
 }
 
 
-::rtl::OUString SAL_CALL Player::getImplementationName(  )
+OUString SAL_CALL Player::getImplementationName(  )
 {
-    return ::rtl::OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME );
+    return OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME );
 }
 
 
-sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
 {
     return ServiceName == AVMEDIA_MACAVF_PLAYER_SERVICENAME;
 }
 
 
-uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
+uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames(  )
 {
     return { AVMEDIA_MACAVF_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx
index 709f35371772..d8d1f71b3772 100644
--- a/avmedia/source/macavf/window.hxx
+++ b/avmedia/source/macavf/window.hxx
@@ -85,9 +85,9 @@ public:
     virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) override;
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) override;
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     virtual bool handleObservation( NSString* pKeyPath ) override;
 
diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm
index 46f9c4c50669..ebd6065df450 100644
--- a/avmedia/source/macavf/window.mm
+++ b/avmedia/source/macavf/window.mm
@@ -239,19 +239,19 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 
 // XServiceInfo
 
-::rtl::OUString SAL_CALL Window::getImplementationName(  )
+OUString SAL_CALL Window::getImplementationName(  )
 {
-    return ::rtl::OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME );
+    return OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME );
 }
 
 
-sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
 {
     return ServiceName == AVMEDIA_MACAVF_WINDOW_SERVICENAME;
 }
 
 
-uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
+uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames(  )
 {
     return { AVMEDIA_MACAVF_WINDOW_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 99b08060b3c4..23cbe6c4730a 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -43,8 +43,8 @@ namespace vlc {
 
 namespace
 {
-    const ::rtl::OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
-    const ::rtl::OUString AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC";
+    const OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.VLCFrameGrabber_VLC";
+    const OUString AVMEDIA_VLC_GRABBER_SERVICENAME = "com.sun.star.media.VLCFrameGrabber_VLC";
     const int MSEC_IN_SEC = 1000;
 
     const char * const VLC_ARGS[] = {
@@ -58,7 +58,7 @@ namespace
     };
 }
 
-VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url )
+VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const OUString& url )
     : FrameGrabber_BASE()
     , mInstance( SAL_N_ELEMENTS(VLC_ARGS), VLC_ARGS )
     , mMedia( url, mInstance )
@@ -71,7 +71,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
 {
     osl::Condition condition;
 
-    const rtl::OUString& fileName = utl::TempFile::CreateTempName();
+    const OUString& fileName = utl::TempFile::CreateTempName();
     {
         wrapper::EventManager manager( mPlayer, mEventHandler );
         manager.onPaused([&condition](){ condition.set(); });
@@ -100,7 +100,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
         manager.onPaused();
     }
 
-    rtl::OUString url;
+    OUString url;
     osl::FileBase::getFileURLFromSystemPath( fileName, url );
     std::shared_ptr<SvStream> stream( utl::UcbStreamHelper::CreateStream( url,
                                                                             StreamMode::STD_READ ) );
@@ -112,17 +112,17 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
     return Graphic( bitmap ).GetXGraphic();
 }
 
-::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName()
+OUString SAL_CALL VLCFrameGrabber::getImplementationName()
 {
     return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
 }
 
-sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName )
+sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const OUString& serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
+::uno::Sequence< OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames()
 {
     return { AVMEDIA_VLC_GRABBER_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 02853c8fda5d..5599f3689f6d 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -38,13 +38,13 @@ class VLCFrameGrabber : public FrameGrabber_BASE
     wrapper::Player mPlayer;
     wrapper::EventHandler& mEventHandler;
 public:
-    VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url );
+    VLCFrameGrabber( wrapper::EventHandler& eh, const OUString& url );
 
     css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override;
 
-    ::rtl::OUString SAL_CALL getImplementationName() override;
-    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
-    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
 }
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index 0b61eeb7d3f7..e82e88b604aa 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -27,8 +27,8 @@ namespace vlc {
 
 namespace
 {
-    const rtl::OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC";
-    const ::rtl::OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC";
+    const OUString VLC_IMPLEMENTATION_NAME = "com.sun.star.comp.avmedia.Manager_VLC";
+    const OUString VLC_SERVICENAME = "com.sun.star.media.Manager_VLC";
 
     const char * const VLC_ARGS[] = {
         "--demux",
@@ -82,7 +82,7 @@ Manager::~Manager()
     mEventHandler.stop();
 }
 
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
 {
     if ( !m_is_vlc_found )
         throw uno::RuntimeException("VLC not found", nullptr);
@@ -105,17 +105,17 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt
     return mPlayer;
 }
 
-rtl::OUString SAL_CALL Manager::getImplementationName()
+OUString SAL_CALL Manager::getImplementationName()
 {
     return VLC_IMPLEMENTATION_NAME;
 }
 
-sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName )
+sal_Bool SAL_CALL Manager::supportsService( const OUString& serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames()
 {
     return { VLC_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx
index 5b83cea984e0..478a2e9d664d 100644
--- a/avmedia/source/vlc/vlcmanager.hxx
+++ b/avmedia/source/vlc/vlcmanager.hxx
@@ -37,15 +37,15 @@ public:
     explicit Manager();
     virtual ~Manager() override;
 
-    css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) override;
+    css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override;
 
-    rtl::OUString SAL_CALL getImplementationName() override;
-    sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) override;
-    css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     css::uno::Reference< css::media::XPlayer >             mPlayer;
-    rtl::OUString                                          mURL;
+    OUString                                               mURL;
     bool                                                   m_is_vlc_found;
 };
 
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index a36064030921..0382b3e1c57c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -33,13 +33,13 @@ namespace vlc {
 
 namespace
 {
-    const ::rtl::OUString AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC";
-    const ::rtl::OUString AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC";
+    const OUString AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Player_VLC";
+    const OUString AVMEDIA_VLC_PLAYER_SERVICENAME = "com.sun.star.media.Player_VLC";
 
     const int MS_IN_SEC = 1000; // Millisec in sec
 }
 
-VLCPlayer::VLCPlayer( const rtl::OUString& url,
+VLCPlayer::VLCPlayer( const OUString& url,
                       wrapper::Instance& instance,
                       wrapper::EventHandler& eh )
     : VLC_Base( m_aMutex )
@@ -232,17 +232,17 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
     return mrFrameGrabber;
 }
 
-::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
+OUString SAL_CALL VLCPlayer::getImplementationName()
 {
     return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
 }
 
-sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
+sal_Bool SAL_CALL VLCPlayer::supportsService( const OUString& serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
+::uno::Sequence< OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
 {
     return { AVMEDIA_VLC_PLAYER_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 8e5298175bc8..c5248707d044 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -44,12 +44,12 @@ class VLCPlayer : public ::cppu::BaseMutex,
     wrapper::Media         mMedia;
     wrapper::Player        mPlayer;
     wrapper::EventManager  mEventManager;
-    const rtl::OUString    mUrl;
+    const OUString         mUrl;
     bool                   mPlaybackLoop;
     css::uno::Reference< css::media::XFrameGrabber > mrFrameGrabber;
     intptr_t               mPrevWinID;
 public:
-    VLCPlayer( const rtl::OUString& url,
+    VLCPlayer( const OUString& url,
                wrapper::Instance& instance,
                wrapper::EventHandler& eh );
 
@@ -73,9 +73,9 @@ public:
     css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
     css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override;
 
-    ::rtl::OUString SAL_CALL getImplementationName() override;
-    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
-    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
     void replay();
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 1887f3ee1424..36894d1f74e8 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -29,8 +29,8 @@ namespace vlc {
 
 namespace
 {
-    const ::rtl::OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC";
-    const ::rtl::OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC";
+    const OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = "com.sun.star.comp.avmedia.Window_VLC";
+    const OUString AVMEDIA_VLC_WINDOW_SERVICENAME = "com.sun.star.media.Window_VLC";
 }
 
 VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID )
@@ -93,17 +93,17 @@ void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 )
 {
 }
 
-::rtl::OUString SAL_CALL VLCWindow::getImplementationName()
+OUString SAL_CALL VLCWindow::getImplementationName()
 {
     return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME;
 }
 
-sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName )
+sal_Bool SAL_CALL VLCWindow::supportsService( const OUString& serviceName )
 {
     return cppu::supportsService(this, serviceName);
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL VLCWindow::getSupportedServiceNames()
 {
     return { AVMEDIA_VLC_WINDOW_SERVICENAME };
 }
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index eaab56d718d2..df0530035412 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -42,9 +42,9 @@ public:
     css::media::ZoomLevel SAL_CALL getZoomLevel() override;
     void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) override;
 
-    ::rtl::OUString SAL_CALL getImplementationName() override;
-    sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override;
-    css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+    OUString SAL_CALL getImplementationName() override;
+    sal_Bool SAL_CALL supportsService( const OUString& serviceName ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
     void SAL_CALL dispose() override;
     void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx
index d884180bbd9d..c6c74420ab53 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -35,9 +35,9 @@ namespace
     char* ( *libvlc_media_get_mrl )(libvlc_media_t *p_md);
 
 
-    libvlc_media_t* InitMedia( const rtl::OUString& url, Instance& instance )
+    libvlc_media_t* InitMedia( const OUString& url, Instance& instance )
     {
-        rtl::OString dest;
+        OString dest;
         url.convertToString(&dest, RTL_TEXTENCODING_UTF8, 0);
 
         return libvlc_media_new_location(instance, dest.getStr());
@@ -61,7 +61,7 @@ bool Media::LoadSymbols()
     return InitApiMap( VLC_MEDIA_API );
 }
 
-Media::Media( const rtl::OUString& url, Instance& instance )
+Media::Media( const OUString& url, Instance& instance )
     : mMedia( InitMedia( url, instance ) )
 {
     if (mMedia == nullptr)
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index 108ec02d2100..2f8e0d8903a0 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -229,9 +229,9 @@ namespace wrapper
 #endif
     }
 
-    void Player::takeSnapshot( const rtl::OUString& file )
+    void Player::takeSnapshot( const OUString& file )
     {
-        rtl::OString dest;
+        OString dest;
         file.convertToString( &dest, RTL_TEXTENCODING_UTF8, 0 );
         libvlc_video_take_snapshot( mPlayer, 0, dest.getStr(), 480, 360 );
     }