diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-07 22:40:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-10 12:57:12 +0100 |
| commit | ab283b90dc66eee3acf0dd356acc2cf909d9041d (patch) | |
| tree | caba88425e490454cfd814a441edc9933a09986a /cui | |
| parent | 5cd00e541da4eca2065ea16f5145a462dee4b5b1 (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>
(cherry picked from commit 1e71870034c9e180f856f51dc2c183d2a6ba9ccd)
Reviewed-on: https://gerrit.libreoffice.org/46069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optgenrl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 |