diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-01 21:17:08 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-02 08:07:52 +0100 |
commit | 4bb67227c142b7a549d3aa2024e398049e8e3222 (patch) | |
tree | d02ac5b5e558e30abe7c463066ce7fc0e62eb95a /xmlsecurity/source | |
parent | 312c0abcff23a5bc7cf4442359ec48187ec06d48 (diff) |
xmlsecurity: create XMLElementWrapper instances with a constructor
Change-Id: I0fe7d0a21b0ea35b537466316a637a0a46c52fe5
Reviewed-on: https://gerrit.libreoffice.org/50601
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/source')
7 files changed, 108 insertions, 43 deletions
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/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx new file mode 100644 index 000000000000..cf550f3e4f33 --- /dev/null +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -0,0 +1,87 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLELEMENTWRAPPER_XMLSECIMPL_HXX +#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLELEMENTWRAPPER_XMLSECIMPL_HXX + +#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/implbase.hxx> + +#include <libxml/tree.h> +#include <xsecxmlsecdllapi.h> + +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; +} } } } + +class XSECXMLSEC_DLLPUBLIC XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper +< + css::xml::wrapper::XXMLElementWrapper, + css::lang::XUnoTunnel, + css::lang::XServiceInfo +> +/****** XMLElementWrapper_XmlSecImpl.hxx/CLASS XMLElementWrapper_XmlSecImpl *** + * + * NAME + * XMLElementWrapper_XmlSecImpl -- Class to wrap a libxml2 node + * + * FUNCTION + * Used as a wrapper class to transfer a libxml2 node structure + * between different UNO components. + ******************************************************************************/ +{ +private: + /* the libxml2 node wrapped by this object */ + xmlNodePtr m_pElement; + +public: + explicit XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode); + + /* XXMLElementWrapper */ + + /* css::lang::XUnoTunnel */ + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; + /// @throws css::uno::RuntimeException + static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId(); + + /* css::lang::XServiceInfo */ + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; + +public: + /* + * NAME + * getNativeElement -- Retrieves the libxml2 node wrapped by this object + * + * SYNOPSIS + * pNode = getNativeElement(); + * + * RESULT + * pNode - the libxml2 node wrapped by this object + */ + xmlNodePtr getNativeElement( ) const { return m_pElement;} +}; + +#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, |