vcl/unx/generic/gdi/x11cairotextrender.cxx | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
New commits:
commit e83ee166799d832bafc2718593e447a4de750ad8
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun May 21 18:42:16 2017 +0100
if X11/Xregion.h is universally available, we can use that instead
Change-Id: I6ede6066037bb97b927faefacfd9a149ac2a0eac
Reviewed-on: https://gerrit.libreoffice.org/37881
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 4f6cc9f08a20..a59a54ff9adc 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -20,33 +20,10 @@
#include "x11cairotextrender.hxx"
#include "unx/saldisp.hxx"
#include "unx/salvd.h"
-
#include "gcach_xpeer.hxx"
-
+#include <X11/Xregion.h>
#include <cairo.h>
-struct BOX
-{
- short x1, x2, y1, y2;
-};
-
-/*
- * Xutil.h contains the declaration:
- * typedef struct _XRegion *Region;
- *
- * this struct has to match the real _Xregion
- * definition, don't change this is remove apparently
- * unused fields
- */
-
-struct _XRegion
-{
- long size;
- long numRects;
- BOX *rects;
- BOX extents;
-};
-
X11CairoTextRender::X11CairoTextRender(X11SalGraphics& rParent)
: mrParent(rParent)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
