diff options
author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-08-01 14:05:42 +0300 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-04 05:47:28 +0000 |
commit | 7f01cf67f8181836430fd3c8433e8bf2f55c95f2 (patch) | |
tree | 983d4518f878f76d5c3057313afc7f2e17d84288 /avmedia | |
parent | e5e7475febbca460c30eaf4959d3282688383ef2 (diff) |
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
in SoundHandler, FrameGrabber, Manager, MissingPluginInstaller,
and several classes in 'avmedia' module.
Change-Id: I9ab42d2ef95f3b0c724a7be9eb9e2389336a6f38
Reviewed-on: https://gerrit.libreoffice.org/27777
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia')
25 files changed, 25 insertions, 65 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index c86583cb8dcb..785f6ced9964 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -125,8 +125,7 @@ sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) // XServiceInfo css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - css::uno::Sequence<OUString> seqServiceNames { "com.sun.star.frame.ContentHandler" }; - return seqServiceNames; + return { "com.sun.star.frame.ContentHandler" }; } /*-************************************************************************************************************ diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 9a37b06402a9..2ad8cfa09515 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -218,9 +218,7 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME }; - - return aRet; + return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME }; } } // namespace gstreamer diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index 28375565e497..d12a66e34f88 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -67,9 +67,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence<OUString> aRet { AVMEDIA_GST_MANAGER_SERVICENAME }; - - return aRet; + return { AVMEDIA_GST_MANAGER_SERVICENAME }; } } // namespace gstreamer diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 24722f03dfe2..a849a585f1da 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -993,9 +993,7 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { - uno::Sequence<OUString> aRet { AVMEDIA_GST_PLAYER_SERVICENAME }; - - return aRet; + return { AVMEDIA_GST_PLAYER_SERVICENAME }; } } // namespace gstreamer diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index 765343dcc003..3b061f3915de 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -233,9 +233,7 @@ sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { - uno::Sequence<OUString> aRet { AVMEDIA_GST_WINDOW_SERVICENAME }; - - return aRet; + return { AVMEDIA_GST_WINDOW_SERVICENAME }; } } // namespace gstreamer diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index c6b85964b099..d95120990823 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -120,9 +120,7 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME }; - - return aRet; + return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME }; } } // namespace macavf diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 06fa6baeb199..1283cb54101e 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -70,9 +70,7 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet { AVMEDIA_MACAVF_MANAGER_SERVICENAME }; - - return aRet; + return { AVMEDIA_MACAVF_MANAGER_SERVICENAME }; } } // namespace macavf diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index e747364d55af..48be43937fd3 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -399,9 +399,7 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName ) uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet { AVMEDIA_MACAVF_PLAYER_SERVICENAME }; - - return aRet; + return { AVMEDIA_MACAVF_PLAYER_SERVICENAME }; } } // namespace macavf diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm index 6bfd6c122466..ba97063a3ab0 100644 --- a/avmedia/source/macavf/window.mm +++ b/avmedia/source/macavf/window.mm @@ -289,8 +289,7 @@ sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet { AVMEDIA_MACAVF_WINDOW_SERVICENAME }; - return aRet; + return { AVMEDIA_MACAVF_WINDOW_SERVICENAME }; } } // namespace macavf diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx index 3b71b23c87f1..9cb7ddd31416 100644 --- a/avmedia/source/opengl/oglframegrabber.cxx +++ b/avmedia/source/opengl/oglframegrabber.cxx @@ -63,8 +63,7 @@ sal_Bool SAL_CALL OGLFrameGrabber::supportsService( const OUString& rServiceName uno::Sequence< OUString > SAL_CALL OGLFrameGrabber::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.media.FrameGrabber_OpenGL" }; - return aRet; + return { "com.sun.star.media.FrameGrabber_OpenGL" }; } } // namespace ogl diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx index b34c51a75f78..0e538373fc5a 100644 --- a/avmedia/source/opengl/oglmanager.cxx +++ b/avmedia/source/opengl/oglmanager.cxx @@ -53,8 +53,7 @@ sal_Bool SAL_CALL OGLManager::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL OGLManager::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { - ::uno::Sequence< OUString > aRet { "com.sun.star.media.Manager_OpenGL" }; - return aRet; + return { "com.sun.star.media.Manager_OpenGL" }; } } // namespace ogl diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 61a980990bf1..4077e3b014d0 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -355,8 +355,7 @@ sal_Bool SAL_CALL OGLPlayer::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { "com.sun.star.media.Player_OpenGL" }; - return aRet; + return { "com.sun.star.media.Player_OpenGL" }; } IMPL_LINK_TYPED(OGLPlayer,TimerHandler,Timer*,pTimer,void) diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index a9ef414a55f3..5c08d74df4d2 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -70,8 +70,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 { "com.sun.star.media.Window_OpenGL" }; - return aRet; + return { "com.sun.star.media.Window_OpenGL" }; } void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception) diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 2fd457bbf092..6817af1f0798 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -119,9 +119,7 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME }; - - return aRet; + return { AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME }; } } // namespace quicktime diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm index 1426020a5be7..0b2ac8ded0e5 100644 --- a/avmedia/source/quicktime/manager.mm +++ b/avmedia/source/quicktime/manager.mm @@ -71,9 +71,7 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_QUICKTIME_MANAGER_SERVICENAME }; - - return aRet; + return { AVMEDIA_QUICKTIME_MANAGER_SERVICENAME }; } } // namespace quicktime diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index 0c32df1e1444..32ab8c6df393 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -365,9 +365,7 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName ) uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_QUICKTIME_PLAYER_SERVICENAME }; - - return aRet; + return { AVMEDIA_QUICKTIME_PLAYER_SERVICENAME }; } } // namespace quicktime diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm index 93b70c250a33..7d0db9af8efe 100644 --- a/avmedia/source/quicktime/window.mm +++ b/avmedia/source/quicktime/window.mm @@ -268,9 +268,7 @@ sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_QUICKTIME_WINDOW_SERVICENAME }; - - return aRet; + return { AVMEDIA_QUICKTIME_WINDOW_SERVICENAME }; } } // namespace quicktime diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 45189d7e0000..beb0ed9a84ad 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -126,8 +126,7 @@ sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& servi ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) { - ::uno::Sequence< OUString > aRet { AVMEDIA_VLC_GRABBER_SERVICENAME }; - return aRet; + return { AVMEDIA_VLC_GRABBER_SERVICENAME }; } } diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 06ad14d08aed..b5819ee40004 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -121,8 +121,7 @@ sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName ) uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { - ::uno::Sequence< OUString > aRet { VLC_SERVICENAME }; - return aRet; + return { VLC_SERVICENAME }; } } // end namespace vlc diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 6e1b3b101d73..5a9e94dedcd2 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -266,8 +266,7 @@ sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet { AVMEDIA_VLC_PLAYER_SERVICENAME }; - return aRet; + return { AVMEDIA_VLC_PLAYER_SERVICENAME }; } } diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 3105ebfec5e4..2a4ad61bb27a 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -103,8 +103,7 @@ sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { - uno::Sequence< OUString > aRet { AVMEDIA_VLC_WINDOW_SERVICENAME }; - return aRet; + return { AVMEDIA_VLC_WINDOW_SERVICENAME }; } void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException, std::exception) diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 65300406b276..7c4cd56d6584 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -217,9 +217,7 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME }; - - return aRet; + return { AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME }; } } // namespace win diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index a5042d4e49b9..b829190f6622 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -72,9 +72,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_WIN_MANAGER_SERVICENAME }; - - return aRet; + return { AVMEDIA_WIN_MANAGER_SERVICENAME }; } } // namespace win diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index c61305dbc9d5..76ffc30616b2 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -497,9 +497,7 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_WIN_PLAYER_SERVICENAME }; - - return aRet; + return { AVMEDIA_WIN_PLAYER_SERVICENAME }; } } // namespace win diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 64bd7c4fe749..4819c9fa5be3 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -596,9 +596,7 @@ sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) throw (uno::RuntimeException) { - uno::Sequence<OUString> aRet { AVMEDIA_WIN_WINDOW_SERVICENAME }; - - return aRet; + return { AVMEDIA_WIN_WINDOW_SERVICENAME }; } } // namespace win |