1 files changed, 4 insertions, 41 deletions
diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx
index fce5aa32d00b..af02de9d7ece 100644
--- a/xmlsecurity/source/gpg/SEInitializer.cxx
+++ b/xmlsecurity/source/gpg/SEInitializer.cxx
@@ -7,14 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "SEInitializer.hxx"
+#include "gpg/SEInitializer.hxx"
 #include "SecurityEnvironment.hxx"
+#include "XMLSecurityContext.hxx"
 
-#include <comphelper/processfactory.hxx>
-#include <cppuhelper/supportsservice.hxx>
-
-#include <com/sun/star/xml/crypto/gpg/GpgSecurityEnvironment.hpp>
-#include <com/sun/star/xml/crypto/gpg/GpgXMLSecurityContext.hpp>
 
 using namespace css;
 using namespace css::lang;
@@ -37,11 +33,9 @@ Reference< XXMLSecurityContext > SAL_CALL SEInitializerGpg::createSecurityContex
     try
     {
         /* Build XML Security Context */
-        Reference< XXMLSecurityContext > xSecCtx = xml::crypto::gpg::GpgXMLSecurityContext::create(m_xContext);
-
-        Reference< XSecurityEnvironment > xSecEnv = xml::crypto::gpg::GpgSecurityEnvironment::create(m_xContext);
-        Reference< XUnoTunnel > xSecEnvTunnel(xSecEnv, uno::UNO_QUERY_THROW);
+        Reference< XXMLSecurityContext > xSecCtx(new XMLSecurityContextGpg());
 
+        Reference< XSecurityEnvironment > xSecEnv(new SecurityEnvironmentGpg());
         sal_Int32 n = xSecCtx->addSecurityEnvironment(xSecEnv);
         //originally the SecurityEnvironment with the internal slot was set as default
         xSecCtx->setDefaultSecurityEnvironmentIndex( n );
@@ -57,35 +51,4 @@ void SAL_CALL SEInitializerGpg::freeSecurityContext( const uno::Reference< XXMLS
 {
 }
 
-OUString SEInitializer_getImplementationName()
-{
-    return OUString("com.sun.star.xml.security.SEInitializer_Gpg");
-}
-
-uno::Sequence< OUString > SAL_CALL SEInitializer_getSupportedServiceNames()
-{
-    return {"com.sun.star.xml.crypto.gpg.GpgSEInitializer"};
-}
-
-uno::Reference< uno::XInterface > SAL_CALL SEInitializer_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF)
-{
-    return static_cast<cppu::OWeakObject*>(new SEInitializerGpg(comphelper::getComponentContext(rxMSF)));
-}
-
-/* XServiceInfo */
-OUString SAL_CALL SEInitializerGpg::getImplementationName()
-{
-    return SEInitializer_getImplementationName();
-}
-
-sal_Bool SAL_CALL SEInitializerGpg::supportsService( const OUString& rServiceName )
-{
-    return cppu::supportsService(this, rServiceName);
-}
-
-uno::Sequence< OUString > SAL_CALL SEInitializerGpg::getSupportedServiceNames()
-{
-    return SEInitializer_getSupportedServiceNames();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */