diff options
-rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 4 | ||||
-rw-r--r-- | config_host/config_gpgme.h.in | 7 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | cui/source/options/optgenrl.cxx | 8 | ||||
-rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 8 | ||||
-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 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 8 |
9 files changed, 24 insertions, 23 deletions
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 36641485fe2e..d51055211e8a 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -56,7 +56,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/sequence.hxx> -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME # include <gpgme.h> # include <context.h> # include <encryptionresult.h> @@ -432,7 +432,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( uno::Sequence< beans::NamedValue > OStorageHelper::CreateGpgPackageEncryptionData() { -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME // generate session key // -------------------- diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in index d12608ef1eef..a8435bd0aa43 100644 --- a/config_host/config_gpgme.h.in +++ b/config_host/config_gpgme.h.in @@ -14,9 +14,10 @@ #define CONFIG_GPGME_H // Defined if gpgme support is available -#define GPGME_HAVE_GPGME 0 -#if GPGME_HAVE_GPGME -#include "config_lgpl.h" +#define HAVE_FEATURE_GPGME 0 + +#if HAVE_FEATURE_GPGME +# include "config_lgpl.h" #endif // Defined if gpgme supports exporting minimal key. diff --git a/configure.ac b/configure.ac index e2833c8bb7af..56d7a9454e2f 100644 --- a/configure.ac +++ b/configure.ac @@ -10217,7 +10217,7 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then fi fi ENABLE_GPGMEPP=TRUE - AC_DEFINE([GPGME_HAVE_GPGME]) + AC_DEFINE([HAVE_FEATURE_GPGME]) fi AC_SUBST(ENABLE_GPGMEPP) AC_SUBST(SYSTEM_GPGMEPP) diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 8639d764c823..5750cc9ff7a0 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -20,9 +20,9 @@ #include <comphelper/string.hxx> #include <config_gpgme.h> -#if GPGME_HAVE_GPGME -#include <com/sun/star/xml/crypto/GPGSEInitializer.hpp> -#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> +#if HAVE_FEATURE_GPGME +# include <com/sun/star/xml/crypto/GPGSEInitializer.hpp> +# include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> #endif #include <i18nlangtag/mslangid.hxx> @@ -214,7 +214,7 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCo InitControls(); SetExchangeSupport(); // this page needs ExchangeSupport SetLinks(); -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME // unused yet, I just wanted to see if this delivers the desired results uno::Reference< xml::crypto::XSEInitializer > xSEInitializer; try diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 635993eb38b6..9ea266907bcb 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -104,7 +104,7 @@ public: /// Test importing of signature line images void testSignatureLineImages(); #ifdef LINUX -# if GPGME_HAVE_GPGME +# if HAVE_FEATURE_GPGME /// Test a typical ODF where all streams are GPG-signed. void testODFGoodGPG(); /// Test a typical ODF where all streams are GPG-signed, but we don't trust the signature. @@ -138,7 +138,7 @@ public: CPPUNIT_TEST(testXAdESGood); CPPUNIT_TEST(testSignatureLineImages); #ifdef LINUX -# if GPGME_HAVE_GPGME +# if HAVE_FEATURE_GPGME CPPUNIT_TEST(testODFGoodGPG); CPPUNIT_TEST(testODFUntrustedGoodGPG); CPPUNIT_TEST(testODFBrokenStreamGPG); @@ -178,7 +178,7 @@ void SigningTest::setUp() setenv("MOZILLA_CERTIFICATE_FOLDER", aTargetPath.toUtf8().getStr(), 1); #endif #ifdef LINUX -# if GPGME_HAVE_GPGME +# if HAVE_FEATURE_GPGME // Make gpg use our own defined setup below data dir OUString aHomePath; osl::FileBase::getSystemPathFromFileURL( @@ -688,7 +688,7 @@ void SigningTest::testSignatureLineImages() } #ifdef LINUX -# if GPGME_HAVE_GPGME +# if HAVE_FEATURE_GPGME void SigningTest::testODFGoodGPG() { createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "goodGPG.odt"); 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()) diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index d65d92eb1374..296c1c847d49 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -28,9 +28,9 @@ #include "xsec_xmlsec.hxx" #include <config_gpgme.h> -#if GPGME_HAVE_GPGME -#include <gpg/xmlsignature_gpgimpl.hxx> -#include <gpg/SEInitializer.hxx> +#if HAVE_FEATURE_GPGME +# include <gpg/xmlsignature_gpgimpl.hxx> +# include <gpg/SEInitializer.hxx> #endif using namespace ::cppu; @@ -46,7 +46,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_ Reference< XInterface > xFactory ; if( pImplName != nullptr ) { -#if GPGME_HAVE_GPGME +#if HAVE_FEATURE_GPGME if( XMLSignature_GpgImpl::impl_getImplementationName().equalsAscii( pImplName ) ) { xFactory = XMLSignature_GpgImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; |