diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-07 22:40:47 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-08 09:13:51 +0100 |
commit | 1e71870034c9e180f856f51dc2c183d2a6ba9ccd (patch) | |
tree | b5112048bb61c66c047fd5158597cd3f689c289a /xmlsecurity/source/helper | |
parent | 8976e546909be0e523dbaf6581c53c1d5b44a1d0 (diff) |
gpg4libre: rename GPGME_HAVE_GPGME to HAVE_FEATURE_GPGME
Change-Id: I6f085b67c3477f427bd1efd96db93cbb89e20647
Reviewed-on: https://gerrit.libreoffice.org/46050
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'xmlsecurity/source/helper')
-rw-r--r-- | xmlsecurity/source/helper/documentsignaturemanager.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecctl.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecverify.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index 205ac7a3162e..fd88d0a52e7e 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -66,14 +66,14 @@ bool DocumentSignatureManager::init() initXmlSec(); mxSEInitializer = xml::crypto::SEInitializer::create(mxContext); -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME mxGpgSEInitializer.set(new SEInitializerGpg()); #endif if (mxSEInitializer.is()) mxSecurityContext = mxSEInitializer->createSecurityContext(OUString()); -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME if (mxGpgSEInitializer.is()) mxGpgSecurityContext = mxGpgSEInitializer->createSecurityContext(OUString()); diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index c746f8012f95..96d04436341f 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -23,7 +23,7 @@ #include <documentsignaturehelper.hxx> #include <framework/saxeventkeeperimpl.hxx> #include <xmlsec/xmldocumentwrapper_xmlsecimpl.hxx> -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME # include <gpg/xmlsignature_gpgimpl.hxx> #endif @@ -161,7 +161,7 @@ void XSecController::createXSecComponent( ) cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, cssu::UNO_QUERY ); if (xServiceInfo->getImplementationName() == "com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl") m_xXMLSignature.set(new XMLSignature_GpgImpl()); diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index 707527d3acdb..1cece7fb4b8b 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -120,7 +120,7 @@ void XSecController::addSignature() void XSecController::switchGpgSignature() { -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME // swap signature verifier for the Gpg one m_xXMLSignature.set(new XMLSignature_GpgImpl()); if (!m_vInternalSignatureInformations.empty()) |