[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - vcl/headless xmlsecurity/source

[Thorsten Behrens (via logerrit)]

 vcl/headless/svpgdi.cxx                                |    7 ++++++-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |   11 ++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 7d4af74ff57ca67cc55a36173c492d474959507d
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Mon Aug 12 11:26:04 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 29 09:21:33 2019 +0200

    tdf#116085 add more Gpg4Win binary locations
    
    Seems Gpg4Win recently grew a few more variants where to put stuff.
    Look there, too.
    
    Change-Id: Ifa09db11665671f518a6a66480c1a71fd619d8cd
    Reviewed-on: https://gerrit.libreoffice.org/77341
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 536ab2f3ba1e71badaaf98db9419ca7c7ddd7ac4)
    Reviewed-on: https://gerrit.libreoffice.org/77421
    Reviewed-on: https://gerrit.libreoffice.org/77913
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index fb39f0f55722..2280c77bbfb1 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -475,9 +475,14 @@ IMPL_STATIC_LINK(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, pButton, vo
     // FIXME: call GpgME::dirInfo("bindir") somewhere in
     // SecurityEnvironmentGpg or whatnot
     // FIXME: perhaps poke GpgME for uiserver, and hope it returns something useful?
-    const OUString aGUIServers[] = { OUString("Gpg4win\\kleopatra.exe"), OUString("GNU\\GnuPG\\kleopatra.exe"),
-                                     OUString("GNU\\GnuPG\\launch-gpa.exe"), OUString("GNU\\GnuPG\\gpa.exe"),
-                                     OUString("GNU\\GnuPG\\bin\\kleopatra.exe"), OUString("GNU\\GnuPG\\bin\\launch-gpa.exe"),
+    const OUString aGUIServers[] = { OUString("Gpg4win\\kleopatra.exe"),
+                                     OUString("Gpg4win\\bin\\kleopatra.exe"),
+                                     OUString("GNU\\GnuPG\\kleopatra.exe"),
+                                     OUString("GNU\\GnuPG\\launch-gpa.exe"),
+                                     OUString("GNU\\GnuPG\\gpa.exe"),
+                                     OUString("GnuPG\\bin\\gpa.exe"),
+                                     OUString("GNU\\GnuPG\\bin\\kleopatra.exe"),
+                                     OUString("GNU\\GnuPG\\bin\\launch-gpa.exe"),
                                      OUString("GNU\\GnuPG\\bin\\gpa.exe") };
     const char* const cPath = "C:\\Program Files (x86)";
 #else
commit ec4c2f7e12958f862c44d0cddadedda9786bdcad
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 9 14:42:54 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 29 09:21:17 2019 +0200

    Resolves: tdf#122358 ensure right/bottom borders are included in damage region
    
    a simple safely backportable expand of damage region by one pixel
    
    Change-Id: If4d226d8546d55b00172d826c8816b09b55d54ef
    Reviewed-on: https://gerrit.libreoffice.org/77209
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/77912
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index e77e12635853..625eb803fa6d 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1465,7 +1465,12 @@ bool SvpSalGraphics::drawPolyPolygon(
         applyColor(cr, m_aLineColor, fTransparency);
 
         // expand with possible StrokeDamage
-        extents.expand(getClippedStrokeDamage(cr));
+        basegfx::B2DRange stroke_extents = getClippedStrokeDamage(cr);
+        // tdf#122358 for a simple fix, just expand damage extents by 1 for now
+        // just results in expanding by one pixel the area to copy to the final
+        // surface
+        stroke_extents.grow(1);
+        extents.expand(stroke_extents);
 
         cairo_stroke_preserve(cr);
     }