From a50c1c1b34a01dc2d8ffa59aa4421bc4906fd236 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Date: Thu, 7 Dec 2017 05:11:15 +0100
Subject: gpg4libre: permit multi-select encrypt cert

And pass down all necessary parameters everywhere

Change-Id: I152b9d84c0e35be9e5193a9a6f67de9fb86133b0
---
 sfx2/source/dialog/filedlghelper.cxx | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'sfx2')

diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 3393046a66bd..6e997d92ebc5 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1521,8 +1521,26 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList,
                 bool bGpg = false;
                 if ( ( aValue >>= bGpg ) && bGpg )
                 {
-                    // ask for a key
-                    rpSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( ::comphelper::OStorageHelper::CreateGpgPackageEncryptionData() ) ) );
+                    uno::Sequence< beans::NamedValue > aEncryptionData;
+                    while(true)
+                    {
+                        try
+                        {
+                            // ask for keys
+                            aEncryptionData = ::comphelper::OStorageHelper::CreateGpgPackageEncryptionData();
+                            break; // user cancelled or we've some keys now
+                        }
+                        catch( const IllegalArgumentException& )
+                        {
+                            ScopedVclPtrInstance< MessageDialog > aBox(
+                                mpPreferredParentWindow,
+                                SfxResId(RID_SVXSTR_INCORRECT_PASSWORD));
+                            aBox->Execute();
+                        }
+                    }
+
+                    if ( aEncryptionData.hasElements() )
+                        rpSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData) ) );
                 }
             }
             catch( const IllegalArgumentException& ){}
-- 
cgit