Convert xmlsecurity to cppu::supportsService

Change-Id: Ifcec9e067e54cc8a3d1254d41d09ea251820849d
This commit is contained in:
Alexandre Vicenzi 2014-01-14 23:28:07 -02:00 committed by Matúš Kukan
parent f907f21e7d
commit 92f162eb0b
6 changed files with 24 additions and 42 deletions

View File

@ -23,6 +23,7 @@
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star::uno;
namespace cssu = com::sun::star::uno;
@ -183,12 +184,6 @@ OUString DecryptorImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName )
throw (cssu::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( )
throw (cssu::RuntimeException)
{
@ -211,11 +206,13 @@ OUString SAL_CALL DecryptorImpl::getImplementationName( )
{
return DecryptorImpl_getImplementationName();
}
sal_Bool SAL_CALL DecryptorImpl::supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
return DecryptorImpl_supportsService( rServiceName );
return cppu::supportsService(this, rServiceName);
}
cssu::Sequence< OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames( )
throw (cssu::RuntimeException)
{

View File

@ -23,6 +23,7 @@
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star::uno;
namespace cssl = com::sun::star::lang;
@ -217,12 +218,6 @@ OUString EncryptorImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName )
throw (RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( )
throw (RuntimeException)
{
@ -246,11 +241,13 @@ OUString SAL_CALL EncryptorImpl::getImplementationName( )
{
return EncryptorImpl_getImplementationName();
}
sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName )
throw (RuntimeException)
{
return EncryptorImpl_supportsService( rServiceName );
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( )
throw (RuntimeException)
{

View File

@ -22,6 +22,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
#include <cppuhelper/supportsservice.hxx>
namespace cssu = com::sun::star::uno;
namespace cssl = com::sun::star::lang;
@ -1364,12 +1365,6 @@ OUString SAXEventKeeperImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName )
throw (cssu::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( )
throw (cssu::RuntimeException)
{
@ -1393,11 +1388,13 @@ OUString SAL_CALL SAXEventKeeperImpl::getImplementationName( )
{
return SAXEventKeeperImpl_getImplementationName();
}
sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
return SAXEventKeeperImpl_supportsService( rServiceName );
return cppu::supportsService(this, rServiceName);
}
cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( )
throw (cssu::RuntimeException)
{

View File

@ -23,6 +23,7 @@
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star::uno;
namespace cssu = com::sun::star::uno;
@ -231,12 +232,6 @@ OUString SignatureCreatorImpl_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName )
throw (cssu::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( )
throw (cssu::RuntimeException)
{
@ -260,11 +255,13 @@ OUString SAL_CALL SignatureCreatorImpl::getImplementationName( )
{
return SignatureCreatorImpl_getImplementationName();
}
sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
return SignatureCreatorImpl_supportsService( rServiceName );
return cppu::supportsService(this, rServiceName);
}
cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( )
throw (cssu::RuntimeException)
{

View File

@ -23,6 +23,7 @@
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace cssu = com::sun::star::uno;
namespace cssl = com::sun::star::lang;
@ -177,12 +178,6 @@ OUString SignatureVerifierImpl_getImplementationName ()
return OUString( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName )
throw (cssu::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( )
throw (cssu::RuntimeException)
{
@ -206,11 +201,13 @@ OUString SAL_CALL SignatureVerifierImpl::getImplementationName( )
{
return SignatureVerifierImpl_getImplementationName();
}
sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
return SignatureVerifierImpl_supportsService( rServiceName );
return cppu::supportsService(this, rServiceName);
}
cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( )
throw (cssu::RuntimeException)
{

View File

@ -30,6 +30,7 @@
#include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
#include <com/sun/star/xml/crypto/CipherID.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <officecfg/Office/Common.hxx>
@ -477,12 +478,6 @@ OUString ONSSInitializer_getImplementationName ()
return OUString ( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName )
throw (cssu::RuntimeException)
{
return ServiceName == NSS_SERVICE_NAME;
}
cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( )
throw (cssu::RuntimeException)
{
@ -504,11 +499,13 @@ OUString SAL_CALL ONSSInitializer::getImplementationName()
{
return ONSSInitializer_getImplementationName();
}
sal_Bool SAL_CALL ONSSInitializer::supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
return ONSSInitializer_supportsService( rServiceName );
return cppu::supportsService(this, rServiceName);
}
cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames( )
throw (cssu::RuntimeException)
{