avmedia/source/gstreamer/gstframegrabber.cxx | 4 +++-
avmedia/source/gstreamer/gstmanager.cxx | 4 +++-
avmedia/source/gstreamer/gstplayer.cxx | 4 +++-
avmedia/source/gstreamer/gstwindow.cxx | 4 +++-
connectivity/source/commontools/ConnectionWrapper.cxx | 3 ++-
5 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 2bb5f4773cc73a13bcd1460c02bc33bb4e60225c
Author: José Guilherme Vanz <v...@libreoffice.org>
Date: Mon Oct 28 00:53:45 2013 -0200
fdo#54938: Convert to use cppu::supportsService
Change-Id: I5b8e08bad3d83b6df23127377c0700fcd27ff084
Signed-off-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx
b/avmedia/source/gstreamer/gstframegrabber.cxx
index 36a7365..63a29ca 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 e23419f..a9aafca 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 14fecf3..201c2ef 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 f1d4a96..39da016 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( )
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx
b/connectivity/source/commontools/ConnectionWrapper.cxx
index 1287acf..3fc14b8 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/uno3.hxx>
#include <comphelper/sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/reflection/ProxyFactory.hpp>
#include <rtl/digest.h>
@@ -133,7 +134,7 @@ OUString SAL_CALL
OConnectionWrapper::getImplementationName( ) throw (::com::su
//
--------------------------------------------------------------------------------
sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString&
_rServiceName ) throw(::com::sun::star::uno::RuntimeException)
{
- return ::comphelper::findValue( getSupportedServiceNames(), _rServiceName,
sal_True ).getLength() != 0;
+ return cppu::supportsService(this, _rServiceName);
}
//
--------------------------------------------------------------------------------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
