From 3d3293144b0e0d2d28136b1b2c7154d6352463b8 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Wed, 16 Oct 2013 19:25:05 -0300
Subject: fdo#54938: Adapt svtools and comphelper module ...

to  use cppu::supportsService and other pieces.

Change-Id: I16893b3d31a8055acd214ff23d01e63d38fe0826
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
---
 basic/source/uno/namecont.cxx | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'basic')

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 70e88d357292..fa71d3615b48 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -61,6 +61,7 @@
 #include <com/sun/star/deployment/ExtensionManager.hpp>
 #include <comphelper/storagehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <basic/sbmod.hxx>
 #include <boost/scoped_ptr.hpp>
 
@@ -2971,20 +2972,9 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServic
     throw (RuntimeException)
 {
     LibraryContainerMethodGuard aGuard( *this );
-    Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
-    const OUString* pSupportedServices = aSupportedServices.getConstArray();
-    for ( sal_Int32 i=0; i<aSupportedServices.getLength(); ++i, ++pSupportedServices )
-    {
-        if ( *pSupportedServices == _rServiceName )
-        {
-            return sal_True;
-        }
-    }
-    return sal_False;
+    return cppu::supportsService(this, _rServiceName);
 }
 
-//============================================================================
-
 // Implementation class SfxLibrary
 
 // Ctor
-- 
cgit