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

[Miklos Vajna (via logerrit)]

 sd/source/ui/func/fuconrec.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 1634699551b9267c16f673707624b15e1dba8acd
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jun 24 13:38:11 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jun 29 09:11:16 2020 +0200

    sd signature line: don't ask for certs on non-first pages
    
    FuConstructRectangle::Deactivate() is called when the drawing is done,
    but also when switching pages. Ask for the cert only once, when the
    drawing is done.
    
    With this, we don't ask for the cert multiple times if the signature
    rectangle is drawn on a non-first page.
    
    (cherry picked from commit 87592cc76a53374a7b177cdba65bc529e0203816)
    
    Change-Id: Ic34cf31cfd1353496bb957939bdaccba69daaa0f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97255
    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 c79753285642..c0adb2266891 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -476,6 +476,13 @@ void FuConstructRectangle::Deactivate()
         return;
     }
 
+    const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
+    if (rMarkList.GetMarkCount() < 1)
+    {
+        // Just switching pages, no signature rectangle yet.
+        return;
+    }
+
     // Finished drawing a signature rectangle, now set it up.
     if (!mpViewShell)
     {