xmlsecurity: create XMLDocumentWrapper instances with a constructor

Change-Id: I23bca00fb0fbcae92e73c4a106b08edd5caf5cf9
Reviewed-on: https://gerrit.libreoffice.org/51720Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx

@@ -211,18 +211,6 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 };
 
-/// @throws css::uno::RuntimeException
-OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName();
-
-/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString >
-    XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  );
-
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-XMLDocumentWrapper_XmlSecImpl_createInstance(
-    const css::uno::Reference< css::uno::XComponentContext > &);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

xmlsecurity/source/xmlsec/xsec_xmlsec.cxx

@@ -22,7 +22,6 @@
 
 #include <cppuhelper/factory.hxx>
 
-#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
 #include "xsec_xmlsec.hxx"
 
 #include <config_gpgme.h>
@@ -53,15 +52,7 @@ SAL_DLLPUBLIC_EXPORT void* xsec_xmlsec_component_getFactory( const sal_Char* pIm
         {
             xFactory = SEInitializerGpg::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
         }
-        else
 #endif
-        if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equalsAscii( pImplName ) )
-        {
-            xFactory = cppu::createSingleComponentFactory(
-                XMLDocumentWrapper_XmlSecImpl_createInstance,
-                OUString::createFromAscii( pImplName ),
-                XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() );
-        }
     }
 
     if( xFactory.is() ) {

xmlsecurity/util/xsec_xmlsec.component

@@ -29,7 +29,8 @@
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl">
     <service name="com.sun.star.xml.crypto.SecurityEnvironment"/>
   </implementation>
-  <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl">
+  <implementation name="com.sun.star.xml.wrapper.XMLDocumentWrapper"
+    constructor="com_sun_star_xml_wrapper_XMLDocumentWrapper_get_implementation">
     <service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/>
   </implementation>
   <implementation name="com.sun.star.xml.wrapper.XMLElementWrapper"

xmlsecurity/util/xsec_xmlsec.windows.component

@@ -31,7 +31,8 @@
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl">
     <service name="com.sun.star.xml.crypto.SecurityEnvironment"/>
   </implementation>
-  <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl">
+  <implementation name="com.sun.star.xml.wrapper.XMLDocumentWrapper"
+    constructor="com_sun_star_xml_wrapper_XMLDocumentWrapper_get_implementation">
     <service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/>
   </implementation>
   <implementation name="com.sun.star.xml.wrapper.XMLElementWrapper"