diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-05 21:22:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-06 09:05:03 +0200 |
| commit | 61a7a43e3a37e1b1fb764f7be2dc1b5504162ec0 (patch) | |
| tree | be4c3a8fec2b6f5482d5f02eb2dac9087dba2a76 /xmlsecurity/source/gpg | |
| parent | 483ca6e6bb9c920cc96212c7042e13fbbb5fa767 (diff) | |
xmlsecurity: convert last non-uno-consturctor based service
Change-Id: Ib8a16c69aa2a05118e329a6552682b7a21d4536a
Reviewed-on: https://gerrit.libreoffice.org/57023
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity/source/gpg')
| -rw-r--r-- | xmlsecurity/source/gpg/SEInitializer.cxx | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx index e7c1910769d7..689d00f726c1 100644 --- a/xmlsecurity/source/gpg/SEInitializer.cxx +++ b/xmlsecurity/source/gpg/SEInitializer.cxx @@ -22,7 +22,6 @@ using namespace css::lang; using namespace css::uno; using namespace css::xml::crypto; - SEInitializerGpg::SEInitializerGpg() { // Also init GpgME while we're at it @@ -57,28 +56,7 @@ void SAL_CALL SEInitializerGpg::freeSecurityContext( const uno::Reference< XXMLS { } - - -uno::Reference< uno::XInterface > SAL_CALL SEInitializerGpg::impl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rxMSF*/) -{ - return static_cast<cppu::OWeakObject*>(new SEInitializerGpg()); -} - -uno::Reference< XSingleServiceFactory > SEInitializerGpg::impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) { - return cppu::createSingleFactory( aServiceManager, impl_getImplementationName(), impl_createInstance, impl_getSupportedServiceNames() ) ; -} - /* XServiceInfo */ -OUString SEInitializerGpg::impl_getImplementationName() -{ - return OUString("com.sun.star.xml.security.SEInitializer_Gpg"); -} - -uno::Sequence< OUString > SEInitializerGpg::impl_getSupportedServiceNames() -{ - return {"com.sun.star.xml.crypto.GPGSEInitializer"}; -} - sal_Bool SAL_CALL SEInitializerGpg::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); @@ -86,12 +64,19 @@ sal_Bool SAL_CALL SEInitializerGpg::supportsService( const OUString& rServiceNam uno::Sequence< OUString > SAL_CALL SEInitializerGpg::getSupportedServiceNames() { - return impl_getSupportedServiceNames(); + return {"com.sun.star.xml.crypto.GPGSEInitializer"}; } OUString SAL_CALL SEInitializerGpg::getImplementationName() { - return impl_getImplementationName(); + return OUString("com.sun.star.xml.security.SEInitializer_Gpg"); +} + +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* +com_sun_star_xml_security_SEInitializer_Gpg_get_implementation( + uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/) +{ + return cppu::acquire(new SEInitializerGpg()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |