[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - filter/source

[Miklos Vajna (via logerrit)]

 filter/source/pdf/impdialog.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 746590257b4404682cf5a9fc85b1b9e34f1f1462
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jun 5 09:29:50 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jun 8 16:46:44 2020 +0200

    Related: tdf#113278 PDF export: improve selection of signing certificate
    
    The action should be "select", not "sign", since we just select the
    certificate in the dialog. Signing will only happen later after the pdf
    export is almost done.
    
    Ignore gpg certificates which are not handled during pdf export. This
    does not implement the request in the bug, but at least hides
    certificates which don't work.
    
    Change-Id: Ib12f2e38bf864b08838e5970cebdba9ff20603bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95573
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 57464ef8b985a47ce0b9682722f01c8913785f74)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95562

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 4d9e7a28b8ec..31f712c47edf 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1533,7 +1533,8 @@ IMPL_LINK_NOARG(ImpPDFTabSigningPage, ClickmaPbSignCertSelect, weld::Button&, vo
 
     // The use may provide a description while choosing a certificate.
     OUString aDescription;
-    maSignCertificate = xSigner->chooseCertificate(aDescription);
+    maSignCertificate = xSigner->selectSigningCertificateWithType(
+        security::CertificateKind::CertificateKind_X509, aDescription);
 
     if (!maSignCertificate.is())
         return;