Adapt to XComponentContext

Change-Id: I2f2c745245722f90b8101995367c55878d568703

5 files changed, 19 insertions, 14 deletions

diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index c09d112c34c3..fbbb16ae4595 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -19,7 +19,6 @@
 
 
 #include "xmldocumentwrapper_xmlsecimpl.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <xmloff/attrlist.hxx>
 #include "xmlelementwrapper_xmlsecimpl.hxx"
@@ -1076,7 +1075,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSuppor
 #undef SERVICE_NAME
 
 cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
-    const cssu::Reference< cssl::XMultiServiceFactory > &)
+    const cssu::Reference< cssu::XComponentContext > &)
     throw( cssu::Exception )
 {
     return (cppu::OWeakObject*) new XMLDocumentWrapper_XmlSecImpl( );
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index c5191072984f..1394fa6edd3e 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -34,6 +34,10 @@
 
 #include <libxml/tree.h>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper4
 <
     com::sun::star::xml::wrapper::XXMLDocumentWrapper,
@@ -262,7 +266,7 @@ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
 SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance(
-    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr)
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > &)
     throw ( com::sun::star::uno::Exception );
 
 #endif
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 57c90a6213ac..d0363b38e4a9 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -23,7 +23,6 @@
 #include <cppuhelper/typeprovider.hxx>
 
 namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
 
 #define SERVICE_NAME "com.sun.star.xml.wrapper.XMLElementWrapper"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl"
@@ -95,7 +94,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupport
 
 cssu::Reference< cssu::XInterface > SAL_CALL
     XMLElementWrapper_XmlSecImpl_createInstance(
-        const cssu::Reference< cssl::XMultiServiceFactory > &)
+        const cssu::Reference< cssu::XComponentContext > &)
     throw( cssu::Exception )
 {
     return (cppu::OWeakObject*) new XMLElementWrapper_XmlSecImpl(NULL);
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 6ae4818f9449..73b0b21ebbfc 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -28,6 +28,10 @@
 
 #include <libxml/tree.h>
 
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
 class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper3
 <
     com::sun::star::xml::wrapper::XXMLElementWrapper,
@@ -89,7 +93,7 @@ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSec
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
 SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance(
     const com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory > & rSMgr)
+        com::sun::star::uno::XComponentContext > &)
     throw ( com::sun::star::uno::Exception );
 
 #endif
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index d53d06371952..c333b3519e83 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -21,7 +21,6 @@
 #include <sal/config.h>
 
 #include <cppuhelper/factory.hxx>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include "serialnumberadapter.hxx"
 #include "xmlelementwrapper_xmlsecimpl.hxx"
@@ -45,20 +44,20 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_
     void* pRet = 0;
     Reference< XInterface > xFactory ;
 
-    if( pImplName != NULL && pServiceManager != NULL ) {
+    if( pImplName != NULL ) {
         if( XMLElementWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
         {
-            xFactory = Reference< XSingleServiceFactory >( createSingleFactory(
-                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+            xFactory = cppu::createSingleComponentFactory(
+                XMLElementWrapper_XmlSecImpl_createInstance,
                 OUString::createFromAscii( pImplName ),
-                XMLElementWrapper_XmlSecImpl_createInstance, XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() ) );
+                XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() );
         }
         else if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
         {
-            xFactory = Reference< XSingleServiceFactory >( createSingleFactory(
-                reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
+            xFactory = cppu::createSingleComponentFactory(
+                XMLDocumentWrapper_XmlSecImpl_createInstance,
                 OUString::createFromAscii( pImplName ),
-                XMLDocumentWrapper_XmlSecImpl_createInstance, XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ) );
+                XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() );
         }
         else if( xml_security::serial_number_adapter::implementationName().equals( OUString::createFromAscii( pImplName ) ) )
         {