[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/unx

Caolán McNamara caolanm at redhat.com
Thu Jun 7 12:06:23 UTC 2018


 vcl/unx/generic/gdi/salgdi.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 77230756187d8642f08e6b4bb937d279f3483533
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 1 13:02:04 2018 +0100

    Resolves: tdf#101798 ResetClipRegion needs to affect cairo drawing too
    
    regression since...
    
    commit cb382034b061b4acd4f0fd490f42af34517a7b8d
    Date:   Fri Jul 1 14:00:00 2016 +0200
    
        tdf#50613 speedup fat line drawing on linux using cairo
    
    Change-Id: I2f1a70f102786228d52199df9960336218c6f9f9
    Reviewed-on: https://gerrit.libreoffice.org/55182
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 1ac940050077..78a08bf59960 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -349,6 +349,9 @@ long X11SalGraphics::GetGraphicsWidth() const
 
 void X11SalGraphics::ResetClipRegion()
 {
+#if ENABLE_CAIRO_CANVAS
+    maClipRegion.SetNull();
+#endif
     mxImpl->ResetClipRegion();
 }
 


More information about the Libreoffice-commits mailing list