[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre' - comphelper/Library_comphelper.mk comphelper/source

[Thorsten Behrens]

 comphelper/Library_comphelper.mk         |    1 +
 comphelper/source/misc/storagehelper.cxx |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 67997a416ecf716a6686bcfd1b09d591bc28e744
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Thu Oct 12 11:42:03 2017 +0200

    Fix build
    
    Change-Id: I6b457704bbe3ebbe5548e1d84fad92569dbecc4a

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 25449f09d919..342cc1629db0 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_defs,comphelper,\
 ))
 
 $(eval $(call gb_Library_use_externals,comphelper,\
+	gpgmepp \
     boost_headers \
     icuuc \
     icu_headers \
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 5f3defa34bf1..91e958ae3199 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -464,11 +464,11 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreateGpgPackageEncryptionDat
     std::unique_ptr<GpgME::Context> ctx;
     GpgME::Error err = GpgME::checkEngine(GpgME::OpenPGP);
     if (err)
-        throw RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol.");
+        throw uno::RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol.");
 
     ctx.reset( GpgME::Context::createForProtocol(GpgME::OpenPGP) );
     if (ctx == nullptr)
-        throw RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol.");
+        throw uno::RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol.");
     ctx->setArmor(false);
     ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
     std::vector<GpgME::Key> keys;
@@ -476,6 +476,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreateGpgPackageEncryptionDat
         ctx->key(
             "0x909BE2575CEDBEA3", err, true));
 
+#if 0
     // good, ctx is setup now, let's sign the lot
     GpgME::Data data_in(
         reinterpret_cast<char*>(xmlSecBufferGetData(pDsigCtx->transformCtx.result)),
@@ -505,7 +506,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreateGpgPackageEncryptionDat
     aContainer[0].Value = makeAny(aGpgEncryptionData);
     aContainer[1].Name = "EncryptionKey";
     aContainer[1].Value = makeAny(aEncryptionData);
-
+#endif
     (void)aDocName;
 
     return aContainer;