[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless

Caolán McNamara caolanm at redhat.com
Mon Nov 30 07:35:12 PST 2015


 vcl/headless/svpgdi.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9401a065d0d53b31427f85a936ef53244ac8a6b8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 30 15:29:03 2015 +0000

    gtk3: glitches because yours truly cannot tell x from y
    
    (cherry picked from commit 2ca429e781cba94608e9838e2c1c50f1e8632b90)
    
    Change-Id: I3b8620a4d8bffeb5e0558c35cb3a063238c12ba5

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 2eb8317..cb83265 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -156,12 +156,12 @@ namespace
         double x1, y1, x2, y2;
 
         cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-        extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+        extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1;
 #if CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR >= 10)
         cairo_region_t *region = cairo_region_create_rectangle(&extents);
 
         cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
-        extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1;
+        extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1;
         cairo_region_intersect_rectangle(region, &extents);
 
         cairo_region_get_extents(region, &extents);


More information about the Libreoffice-commits mailing list