fdo#54938 Convert chart2 to cppu::supportsService
Change-Id: I26e993a6b0dfc54637651b1a093d896faf5b42d3 Reviewed-on: https://gerrit.libreoffice.org/7644 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com> Tested-by: Marcos Souza <marcos.souza.org@gmail.com>
This commit is contained in:
parent
5685b96509
commit
74c876e615
3 changed files with 6 additions and 26 deletions
|
@ -20,6 +20,7 @@
|
|||
#include "NameContainer.hxx"
|
||||
|
||||
#include <com/sun/star/uno/Any.hxx>
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
|
||||
using namespace ::com::sun::star;
|
||||
using ::com::sun::star::uno::Sequence;
|
||||
|
@ -66,14 +67,7 @@ OUString SAL_CALL NameContainer::getImplementationName()
|
|||
sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName )
|
||||
throw( ::com::sun::star::uno::RuntimeException )
|
||||
{
|
||||
Sequence< OUString > aSNL = getSupportedServiceNames();
|
||||
const OUString* pArray = aSNL.getArray();
|
||||
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
|
||||
{
|
||||
if( pArray[ i ] == ServiceName )
|
||||
return sal_True;
|
||||
}
|
||||
return sal_False;
|
||||
return cppu::supportsService(this, ServiceName);
|
||||
}
|
||||
|
||||
Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames()
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include <vcl/window.hxx>
|
||||
#include <tools/gen.hxx>
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -184,14 +185,7 @@ uno::Sequence< OUString > DummyXShape::getSupportedServiceNames()
|
|||
sal_Bool DummyXShape::supportsService( const OUString& rServiceName )
|
||||
throw(uno::RuntimeException)
|
||||
{
|
||||
uno::Sequence< OUString > aSupportedServices = listSupportedServices();
|
||||
for(sal_Int32 i = 0; i < aSupportedServices.getLength(); ++i)
|
||||
{
|
||||
if(aSupportedServices[i] == rServiceName)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return cppu::supportsService(this, ServiceName);
|
||||
}
|
||||
|
||||
uno::Reference< uno::XInterface > DummyXShape::getParent()
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
#include "sampleaddin.hxx"
|
||||
|
||||
#include <cppuhelper/supportsservice.hxx>
|
||||
#include <cppuhelper/factory.hxx>
|
||||
#include <osl/diagnose.h>
|
||||
|
||||
|
@ -633,16 +634,7 @@ OUString SAL_CALL SampleAddIn::getImplementationName() throw( uno::RuntimeExcept
|
|||
sal_Bool SAL_CALL SampleAddIn::supportsService( const OUString& ServiceName )
|
||||
throw( uno::RuntimeException )
|
||||
{
|
||||
uno::Sequence< OUString > aServiceSeq = getSupportedServiceNames_Static();
|
||||
|
||||
sal_Int32 nLength = aServiceSeq.getLength();
|
||||
for( sal_Int32 i=0; i < nLength; i++ )
|
||||
{
|
||||
if( ServiceName.equals( aServiceSeq[ i ] ))
|
||||
return sal_True;
|
||||
}
|
||||
|
||||
return sal_False;
|
||||
return cppu::supportsService(this, ServiceName);
|
||||
}
|
||||
|
||||
uno::Sequence< OUString > SAL_CALL SampleAddIn::getSupportedServiceNames()
|
||||
|
|
Loading…
Reference in a new issue