diff options
author | José Guilherme Vanz <vanz@libreoffice.org> | 2013-10-28 00:53:45 -0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-04 12:24:18 +0100 |
commit | 2bb5f4773cc73a13bcd1460c02bc33bb4e60225c (patch) | |
tree | cf14cd65bf512283c5e5eddcba7b37ec238ba7b7 /avmedia | |
parent | minor cleanup in ScHeaderControl: nCount is always greater than 0 (diff) | |
download | core-2bb5f4773cc73a13bcd1460c02bc33bb4e60225c.tar.gz core-2bb5f4773cc73a13bcd1460c02bc33bb4e60225c.zip |
fdo#54938: Convert to use cppu::supportsService
Change-Id: I5b8e08bad3d83b6df23127377c0700fcd27ff084
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstmanager.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 4 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstwindow.cxx | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 36a73658a457..63a29ca00220 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -20,6 +20,8 @@ #include "gstframegrabber.hxx" #include "gstplayer.hxx" +#include <cppuhelper/supportsservice.hxx> + #include <gst/gstbuffer.h> #include <gst/video/video.h> #include <gst/video/gstvideosink.h> @@ -210,7 +212,7 @@ OUString SAL_CALL FrameGrabber::getImplementationName( ) sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName == AVMEDIA_GST_FRAMEGRABBER_SERVICENAME; + return cppu::supportsService(this, ServiceName);; } uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames() diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index e23419ff19c8..a9aafca288e4 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <cppuhelper/supportsservice.hxx> + #include "gstmanager.hxx" #include "gstplayer.hxx" @@ -82,7 +84,7 @@ OUString SAL_CALL Manager::getImplementationName( ) sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName == AVMEDIA_GST_MANAGER_SERVICENAME; + return cppu::supportsService(this, ServiceName); } // ------------------------------------------------------------------------------ diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 14fecf3b5253..201c2ef3d3f0 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -19,6 +19,8 @@ #include <math.h> +#include <cppuhelper/supportsservice.hxx> + #include <rtl/string.hxx> #include <vcl/syschild.hxx> @@ -711,7 +713,7 @@ OUString SAL_CALL Player::getImplementationName() sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName == AVMEDIA_GST_PLAYER_SERVICENAME; + return cppu::supportsService(this, ServiceName); } // ------------------------------------------------------------------------------ diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index f1d4a9670b78..39da016e26c5 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -19,6 +19,8 @@ #include <com/sun/star/awt/SystemPointer.hpp> +#include <cppuhelper/supportsservice.hxx> + #include "gstwindow.hxx" #include "gstplayer.hxx" @@ -228,7 +230,7 @@ OUString SAL_CALL Window::getImplementationName( ) sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - return ServiceName == AVMEDIA_GST_WINDOW_SERVICENAME; + return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) |