summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--solenv/clang-format/blacklist2
-rw-r--r--xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx46
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx (renamed from xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx)11
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.cxx10
-rw-r--r--xmlsecurity/util/xsec_xmlsec.component3
-rw-r--r--xmlsecurity/util/xsec_xmlsec.windows.component3
10 files changed, 26 insertions, 57 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9ab96f7e1473..41e3a7a55169 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -19676,7 +19676,6 @@ xmlsecurity/inc/xmlsec-wrapper.h
xmlsecurity/inc/xmlsec/errorcallback.hxx
xmlsecurity/inc/xmlsec/saxhelper.hxx
xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
-xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
xmlsecurity/inc/xmlsec/xmlsec_init.hxx
xmlsecurity/inc/xmlsec/xmlstreamio.hxx
xmlsecurity/inc/xmlsecuritydllapi.h
@@ -19786,6 +19785,7 @@ xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
xmlsecurity/source/xmlsec/saxhelper.cxx
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
xmlsecurity/source/xmlsec/xmlsec_init.cxx
xmlsecurity/source/xmlsec/xmlstreamio.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 82016b8871bd..896970d4b40f 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -39,7 +39,7 @@
#include <importresult.h>
#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
-#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
+#include <xmlelementwrapper_xmlsecimpl.hxx>
#include <xmlsec/xmlstreamio.hxx>
#include <xmlsec/errorcallback.hxx>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index f7ade4e54161..0a35533ccd54 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -26,7 +26,7 @@
#include "securityenvironment_mscryptimpl.hxx"
#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
-#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
+#include <xmlelementwrapper_xmlsecimpl.hxx>
#include <xmlsec/xmlstreamio.hxx>
#include <xmlsec/errorcallback.hxx>
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index bc8d3ca2517f..f4b1364f52dd 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -21,7 +21,7 @@
#include <rtl/uuid.h>
#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
-#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
+#include <xmlelementwrapper_xmlsecimpl.hxx>
#include <xmlsec/xmlstreamio.hxx>
#include <xmlsec/errorcallback.hxx>
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 1e75168e014d..a03f62cb3379 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
-#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
+#include "xmlelementwrapper_xmlsecimpl.hxx"
#include <xmloff/attrlist.hxx>
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 76f9bd16d2c4..4f9e8c8047e6 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -19,32 +19,27 @@
#include <string.h>
-#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
+#include "xmlelementwrapper_xmlsecimpl.hxx"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
-namespace cssu = com::sun::star::uno;
-
-#define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl"
+using namespace com::sun::star;
XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode)
: m_pElement( pNode )
{
}
-/* XXMLElementWrapper */
-
-
/* XUnoTunnel */
-cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId()
+uno::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId()
{
static ::cppu::OImplementationId implId;
return implId.getImplementationId();
}
-sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Sequence< sal_Int8 >& aIdentifier )
+sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier )
{
if (aIdentifier.getLength() == 16 &&
0 == memcmp(
@@ -60,37 +55,28 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque
}
}
-
-OUString XMLElementWrapper_XmlSecImpl_getImplementationName ()
+/* XServiceInfo */
+OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName( )
{
- return OUString ( IMPLEMENTATION_NAME );
+ return OUString("com.sun.star.xml.wrapper.XMLElementWrapper");
}
-cssu::Sequence< OUString > XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName )
{
- cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLElementWrapper" };
- return aRet;
+ return cppu::supportsService( this, rServiceName );
}
-cssu::Reference< cssu::XInterface >
- XMLElementWrapper_XmlSecImpl_createInstance(
- const cssu::Reference< cssu::XComponentContext > &)
+uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames( )
{
- return static_cast<cppu::OWeakObject*>(new XMLElementWrapper_XmlSecImpl(nullptr));
+ uno::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLElementWrapper" };
+ return aRet;
}
-/* XServiceInfo */
-OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName( )
-{
- return XMLElementWrapper_XmlSecImpl_getImplementationName();
-}
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName )
-{
- return cppu::supportsService( this, rServiceName );
-}
-cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames( )
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_xml_wrapper_XMLElementWrapper_get_implementation(
+ uno::XComponentContext* /*pCtx*/, uno::Sequence<uno::Any> const& /*rSeq*/)
{
- return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames();
+ return cppu::acquire(new XMLElementWrapper_XmlSecImpl(nullptr));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index f9ab86b7cd92..cf550f3e4f33 100644
--- a/xmlsecurity/inc/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -82,17 +82,6 @@ public:
xmlNodePtr getNativeElement( ) const { return m_pElement;}
};
-/// @throws css::uno::RuntimeException
-OUString XMLElementWrapper_XmlSecImpl_getImplementationName();
-
-/// @throws css::uno::RuntimeException
-css::uno::Sequence< OUString > XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( );
-
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-XMLElementWrapper_XmlSecImpl_createInstance(
- const css::uno::Reference< css::uno::XComponentContext > &);
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 50cd2981d58a..371b500e6d5d 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -22,7 +22,6 @@
#include <cppuhelper/factory.hxx>
-#include <xmlsec/xmlelementwrapper_xmlsecimpl.hxx>
#include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx>
#include "xsec_xmlsec.hxx"
@@ -56,14 +55,7 @@ SAL_DLLPUBLIC_EXPORT void* xsec_xmlsec_component_getFactory( const sal_Char* pIm
}
else
#endif
- if( XMLElementWrapper_XmlSecImpl_getImplementationName().equalsAscii( pImplName ) )
- {
- xFactory = cppu::createSingleComponentFactory(
- XMLElementWrapper_XmlSecImpl_createInstance,
- OUString::createFromAscii( pImplName ),
- XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() );
- }
- else if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equalsAscii( pImplName ) )
+ if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equalsAscii( pImplName ) )
{
xFactory = cppu::createSingleComponentFactory(
XMLDocumentWrapper_XmlSecImpl_createInstance,
diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component
index 677e2c7ed93c..d3fbf574482a 100644
--- a/xmlsecurity/util/xsec_xmlsec.component
+++ b/xmlsecurity/util/xsec_xmlsec.component
@@ -32,7 +32,8 @@
<implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl">
<service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/>
</implementation>
- <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl">
+ <implementation name="com.sun.star.xml.wrapper.XMLElementWrapper"
+ constructor="com_sun_star_xml_wrapper_XMLElementWrapper_get_implementation">
<service name="com.sun.star.xml.wrapper.XMLElementWrapper"/>
</implementation>
<implementation name="com.sun.star.xml.crypto.XMLSecurityContext"
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
index 6280adf0e5a8..b01c61ca73ad 100644
--- a/xmlsecurity/util/xsec_xmlsec.windows.component
+++ b/xmlsecurity/util/xsec_xmlsec.windows.component
@@ -34,7 +34,8 @@
<implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl">
<service name="com.sun.star.xml.wrapper.XMLDocumentWrapper"/>
</implementation>
- <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl">
+ <implementation name="com.sun.star.xml.wrapper.XMLElementWrapper"
+ constructor="com_sun_star_xml_wrapper_XMLElementWrapper_get_implementation">
<service name="com.sun.star.xml.wrapper.XMLElementWrapper"/>
</implementation>
<implementation name="com.sun.star.xml.crypto.XMLSecurityContext"
generated by cgit (git 2.34.1) at 2025-02-27 09:26:43 +0000