[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - filter/source sd/source

[Miklos Vajna (via logerrit)]

 filter/source/pdf/impdialog.cxx |    3 ++-
 sd/source/ui/func/fuconrec.cxx  |   30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 1e063dceb08adbb2d3a5eeb44091c356b45b5154
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jun 5 12:36:00 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jun 26 08:52:19 2020 +0200

    sd signature line: create a graphic object
    
    And don't inherit the default blue fill style / line style.
    
    The actual graphic content is not yet filled, though.
    
    (cherry picked from commit 961655e7a8a925680271c7736a7d50ed62af6af4)
    
    Change-Id: Iebd5bf98c7c63cfa1a4d7a72cfb53d9e1fb5aeee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97172
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 3fd7a099ab07..63daa06171c4 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -58,6 +58,7 @@
 #include <editeng/writingmodeitem.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <svx/xfillit0.hxx>
 
 #include <sdresid.hxx>
 #include <View.hxx>
@@ -68,6 +69,8 @@
 
 #include <strings.hrc>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 
@@ -407,6 +410,11 @@ void FuConstructRectangle::Activate()
             mpView->SetGlueVisible();
         }
         break;
+        case SID_INSERT_SIGNATURELINE:
+        {
+            aObjKind = OBJ_GRAF;
+        }
+        break;
 
         default:
         {
@@ -422,6 +430,28 @@ void FuConstructRectangle::Activate()
 
 void FuConstructRectangle::Deactivate()
 {
+    if (nSlotId == SID_INSERT_SIGNATURELINE)
+    {
+        const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
+        if (rMarkList.GetMarkCount() > 0)
+        {
+            // Avoid the default solid fill and line, we'll set a graphic instead.
+            const SdrMark* pMark = rMarkList.GetMark(0);
+            SdrObject* pObject = pMark->GetMarkedSdrObj();
+            SfxItemSet aSet = pObject->GetMergedItemSet();
+
+            XFillStyleItem aFillStyleItem(aSet.Get(XATTR_FILLSTYLE));
+            aFillStyleItem.SetValue(drawing::FillStyle_NONE);
+            aSet.Put(aFillStyleItem);
+
+            XLineStyleItem aLineStyleItem(aSet.Get(XATTR_LINESTYLE));
+            aLineStyleItem.SetValue(drawing::LineStyle_NONE);
+            aSet.Put(aLineStyleItem);
+
+            pObject->SetMergedItemSet(aSet);
+        }
+    }
+
     if( nSlotId == SID_TOOL_CONNECTOR               ||
         nSlotId == SID_CONNECTOR_ARROW_START        ||
         nSlotId == SID_CONNECTOR_ARROW_END          ||
commit 0dda1df36b984227804172185c3584ebc0a9bb5f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jun 5 09:29:50 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jun 26 08:52:05 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.
    
    (cherry picked from commit 57464ef8b985a47ce0b9682722f01c8913785f74)
    
    Change-Id: Ib12f2e38bf864b08838e5970cebdba9ff20603bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97171
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 60495f90ec65..c1d549a9b9ef 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1500,7 +1500,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())
     {