fdo#54938: Kill ServiceInfoHelper::supportsService and use cppu's instead.

Change-Id: I1c2d95e4c3fb6242dcb4cdb88cf9733471a3412b
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 6 insertions, 11 deletions

diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 9c8c1e0171a8..6ee8b68b93bf 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -26,7 +26,7 @@
 #include <svtools/unoevent.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <comphelper/serviceinfohelper.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 #include <cppuhelper/implbase2.hxx>
 #include <svx/unofill.hxx>
@@ -557,7 +557,7 @@ OUString SAL_CALL SvxUnoDrawingModel::getImplementationName()
 sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName )
     throw(uno::RuntimeException)
 {
-    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames() throw(uno::RuntimeException)
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index bdd2658deb50..b0550a93cb14 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -22,7 +22,7 @@
 #include <osl/mutex.hxx>
 #include <sfx2/dispatch.hxx>
 #include <comphelper/classids.hxx>
-#include <comphelper/serviceinfohelper.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 #include <sfx2/objsh.hxx>
 #include <svx/svdpool.hxx>
@@ -816,7 +816,7 @@ OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeExcept
 sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return cppu::supportsService( this, ServiceName );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException )
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 129d0759a57f..739ee752ee5b 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -21,7 +21,7 @@
 
 #include "svx/unoshcol.hxx"
 #include <svx/unoprov.hxx>
-#include <comphelper/serviceinfohelper.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
@@ -196,22 +196,17 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index )
 }
 
 // XElementAccess
-
-//----------------------------------------------------------------------
 uno::Type SAL_CALL SvxShapeCollection::getElementType() throw( uno::RuntimeException )
 {
     return ::getCppuType(( const Reference< drawing::XShape >*)0);
 }
 
-//----------------------------------------------------------------------
 sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException )
 {
     return getCount() != 0;
 }
 
-//----------------------------------------------------------------------
 // XServiceInfo
-//----------------------------------------------------------------------
 OUString SAL_CALL SvxShapeCollection::getImplementationName()
     throw( uno::RuntimeException )
 {
@@ -226,7 +221,7 @@ OUString SvxShapeCollection::getImplementationName_Static()
 sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return cppu::supportsService( this, ServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException )