From 8f6d2eef50e1fabac30233c23a800da2c1c8ebc9 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Tue, 22 Oct 2013 23:49:31 -0200
Subject: fdo#54938: Kill ServiceInfoHelper::supportsService and use cppu's
 instead.

Change-Id: I1c2d95e4c3fb6242dcb4cdb88cf9733471a3412b
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
---
 sd/source/ui/slideshow/slideshow.cxx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'sd/source/ui/slideshow/slideshow.cxx')

diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 2d50fc3ebf4f..7c305e85032f 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/util/URL.hpp>
 
 #include <cppuhelper/bootstrap.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <osl/mutex.hxx>
@@ -260,24 +261,17 @@ void SlideShow::CreateController(  ViewShell* pViewSh, ::sd::View* pView, ::Wind
 
 }
 
-// --------------------------------------------------------------------
 // XServiceInfo
-// --------------------------------------------------------------------
-
 OUString SAL_CALL SlideShow::getImplementationName(  ) throw(RuntimeException)
 {
     return OUString( "com.sun.star.comp.sd.SlideShow" );
 }
 
-// --------------------------------------------------------------------
-
 sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName ) throw(RuntimeException)
 {
-    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames(  ) );
+    return cppu::supportsService( this, ServiceName );
 }
 
-// --------------------------------------------------------------------
-
 Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     OUString aService( "com.sun.star.presentation.Presentation" );
@@ -285,10 +279,7 @@ Sequence< OUString > SAL_CALL SlideShow::getSupportedServiceNames(  ) throw(Runt
     return aSeq;
 }
 
-// --------------------------------------------------------------------
 // XPropertySet
-// --------------------------------------------------------------------
-
 Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -296,8 +287,6 @@ Reference< XPropertySetInfo > SAL_CALL SlideShow::getPropertySetInfo() throw(Run
     return xInfo;
  }
 
-// --------------------------------------------------------------------
-
 void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     SolarMutexGuard aGuard;
-- 
cgit