avmedia: Use appropriate OUString functions on string constants

Change-Id: Ie2e2737c1a3eafd9da2472ef354624b67b09ff80

9 files changed, 9 insertions, 10 deletions

diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 048365f76d9c..9017a529a958 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -107,7 +107,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
 }
 
 #define IMPLEMENTATIONNAME_SOUNDHANDLER OUString("com.sun.star.comp.framework.SoundHandler")
-#define SERVICENAME_CONTENTHANDLER OUString("com.sun.star.frame.ContentHandler")
 
 /*===========================================================================================================*/
 /* XServiceInfo */
@@ -133,7 +132,7 @@ css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames()
 css::uno::Sequence< OUString > SoundHandler::impl_getStaticSupportedServiceNames()
 {
     css::uno::Sequence< OUString > seqServiceNames( 1 );
-    seqServiceNames.getArray() [0] = SERVICENAME_CONTENTHANDLER;
+    seqServiceNames.getArray() [0] = "com.sun.star.frame.ContentHandler";
     return seqServiceNames;
 }
 
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx
index f98b4e188cb7..a6e43fd59684 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -64,7 +64,7 @@ uno::Sequence< OUString > SAL_CALL OGLFrameGrabber::getSupportedServiceNames()
         throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.media.FrameGrabber_OpenGL");
+    aRet[0] = "com.sun.star.media.FrameGrabber_OpenGL";
     return aRet;
 }
 
diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx
index afd55cad6ed4..ed290a89e2ec 100644
--- a/avmedia/source/opengl/oglmanager.cxx
+++ b/avmedia/source/opengl/oglmanager.cxx
@@ -56,7 +56,7 @@ uno::Sequence< OUString > SAL_CALL OGLManager::getSupportedServiceNames()
         throw ( uno::RuntimeException, std::exception )
 {
     ::uno::Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.media.Manager_OpenGL");
+    aRet[0] = "com.sun.star.media.Manager_OpenGL";
     return aRet;
 }
 
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index f8105133658c..910974e5adea 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -353,7 +353,7 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames()
      throw ( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.media.Player_OpenGL");
+    aRet[0] = "com.sun.star.media.Player_OpenGL";
     return aRet;
 }
 
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 2c9d40ad142e..f89e21d3bff3 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -71,7 +71,7 @@ sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName ) thr
 uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
 {
     uno::Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.media.Window_OpenGL");
+    aRet[0] = "com.sun.star.media.Window_OpenGL";
     return aRet;
 }
 
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index 3a8868950225..7f7ee5986df5 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -129,7 +129,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
     throw (uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME );
+    aRet[0] = AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME;
 
     return aRet;
 }
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index 7de493c895dd..f4e819212079 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -80,7 +80,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
+    aRet[0] = AVMEDIA_QUICKTIME_MANAGER_SERVICENAME;
 
     return aRet;
 }
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 79e7dd753ede..74745c7a3e3d 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -383,7 +383,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME );
+    aRet[0] = AVMEDIA_QUICKTIME_PLAYER_SERVICENAME;
 
     return aRet;
 }
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index 52736f0b8aaf..90092addacc4 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -274,7 +274,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
     uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
+    aRet[0] = AVMEDIA_QUICKTIME_WINDOW_SERVICENAME;
 
     return aRet;
 }