diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-05-18 03:48:09 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-05-18 09:19:32 +0200 |
commit | c667669cf9a71d10db2add32d8b592605755ee1c (patch) | |
tree | 7fd7f8a7286e506870efadd4b77156e37b4d30eb /xmlsecurity/source | |
parent | cae5f2a543b31552ccd9765aca5eb514fa694e07 (diff) |
gpg4libre: fix windows build
Change-Id: I66b809bbf2f5ab5d9c1eaf40ba8f2c91f4bc8007
Diffstat (limited to 'xmlsecurity/source')
8 files changed, 22 insertions, 22 deletions
diff --git a/xmlsecurity/source/gpg/GpgComponentFactory.cxx b/xmlsecurity/source/gpg/GpgComponentFactory.cxx index 88d1ac854395..2f3048a68a8c 100644 --- a/xmlsecurity/source/gpg/GpgComponentFactory.cxx +++ b/xmlsecurity/source/gpg/GpgComponentFactory.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star::registry; extern "C" { -void* SAL_CALL gpg_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_gpg_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* /*pRegistryKey*/ ) { void* pRet = nullptr; Reference< XSingleServiceFactory > xFactory ; diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index b33d7990c66d..4f4ff7956750 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -112,9 +112,9 @@ SAL_CALL XMLSignature_GpgImpl::generate( // Calculate digest for all references xmlNodePtr cur = xmlSecGetNextElementNode(pNode->children); - if( cur != NULL ) + if( cur != nullptr ) cur = xmlSecGetNextElementNode(cur->children); - while( cur != NULL ) + while( cur != nullptr ) { // some of those children I suppose should be reference elements if( xmlSecCheckNodeName(cur, xmlSecNodeReference, xmlSecDSigNs) ) @@ -122,7 +122,7 @@ SAL_CALL XMLSignature_GpgImpl::generate( xmlSecDSigReferenceCtxPtr pDsigRefCtx = xmlSecDSigReferenceCtxCreate(pDsigCtx, xmlSecDSigReferenceOriginSignedInfo); - if(pDsigRefCtx == NULL) + if(pDsigRefCtx == nullptr) throw RuntimeException(); // add this one to the list @@ -152,9 +152,9 @@ SAL_CALL XMLSignature_GpgImpl::generate( // ------------------------------------------------------- // run the transformations - xmlSecNodeSetPtr nodeset = NULL; + xmlSecNodeSetPtr nodeset = nullptr; nodeset = xmlSecNodeSetGetChildren(pNode->doc, pNode, 1, 0); - if(nodeset == NULL) + if(nodeset == nullptr) throw RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol."); if( xmlSecTransformCtxXmlExecute(&(pDsigCtx->transformCtx), nodeset) < 0 ) diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index fa99d8d8a5b1..2931f60566bc 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -48,12 +48,12 @@ void errorCallback(const char* file, SAL_WARN("xmlsecurity.xmlsec", file << ":" << line << ": " << func << "() '" << pErrorObject << "' '" << pErrorSubject << "' " << reason << " '" << pMsg << "'" << systemErrorString); } -SAL_DLLPUBLIC_EXPORT void setErrorRecorder() +XSECXMLSEC_DLLPUBLIC void setErrorRecorder() { xmlSecErrorsSetCallback(errorCallback); } -SAL_DLLPUBLIC_EXPORT void clearErrorRecorder() +XSECXMLSEC_DLLPUBLIC void clearErrorRecorder() { xmlSecErrorsSetCallback(nullptr); } diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 14d21e1ef98f..32fa51fa8c7b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -24,11 +24,10 @@ #include "xmlencryption_mscryptimpl.hxx" #include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" - -#include "xmlelementwrapper_xmlsecimpl.hxx" +#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" +#include "xmlsec/errorcallback.hxx" #include "securityenvironment_mscryptimpl.hxx" -#include "errorcallback.hxx" #include "xmlsec-wrapper.h" diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index df5fb696db25..90dd4e833af4 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -21,10 +21,10 @@ #include "securityenvironment_mscryptimpl.hxx" #include "xmlsecuritycontext_mscryptimpl.hxx" -#include "xmlstreamio.hxx" +#include "xmlsec/xmlstreamio.hxx" +#include "xmlsec/mscrypto/akmngr.h" #include "xmlsec-wrapper.h" -#include "xmlsec/mscrypto/akmngr.h" using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index c61af389528a..08b4bf2ddc51 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -21,12 +21,15 @@ #include <rtl/uuid.h> #include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp> + #include "xmlsignature_mscryptimpl.hxx" -#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" -#include "xmlelementwrapper_xmlsecimpl.hxx" #include "securityenvironment_mscryptimpl.hxx" -#include "xmlstreamio.hxx" -#include "errorcallback.hxx" + +#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" +#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" +#include "xmlsec/xmlstreamio.hxx" +#include "xmlsec/errorcallback.hxx" + #include "xmlsec-wrapper.h" using namespace ::com::sun::star::uno ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index ecaad3cab95b..92f50d9acb26 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -34,9 +34,7 @@ #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp> #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> -#include "xsecxmlsecdllapi.h" - -class XSECXMLSEC_DLLPUBLIC XMLSignature_NssImpl : public ::cppu::WeakImplHelper< +class XMLSignature_NssImpl : public ::cppu::WeakImplHelper< css::xml::crypto::XXMLSignature , css::lang::XServiceInfo > { diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 710f9795aca4..6faf711c181b 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -180,7 +180,7 @@ int xmlEnableStreamInputCallbacks() return 0 ; } -SAL_DLLPUBLIC_EXPORT int xmlRegisterStreamInputCallbacks( +XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks( css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding ) { if( !( enableXmlStreamIO & XMLSTREAMIO_INITIALIZED ) ) { @@ -197,7 +197,7 @@ SAL_DLLPUBLIC_EXPORT int xmlRegisterStreamInputCallbacks( return 0 ; } -SAL_DLLPUBLIC_EXPORT int xmlUnregisterStreamInputCallbacks() +XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks() { if( ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) { //Clear the uri-stream binding |