ooo-build r12367 - in branches/ooo-build-2-4: . patches/src680

[tml svn gnome org]

Author: tml
Date: Tue Apr 29 08:35:34 2008
New Revision: 12367
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12367&view=rev

Log:
2008-04-29  Tor Lillqvist  <tml novell com>

	* patches/src680/cairo-canvas-use-window-screen.diff: Don't assume
	cairo-canvas-win32.diff has been applied. This diff is mentioned
	first in the apply file. (And actually, the win32-specific diffs
	to cairo are going to go away.)



Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff

Modified: branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff
==============================================================================
--- branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff	(original)
+++ branches/ooo-build-2-4/patches/src680/cairo-canvas-use-window-screen.diff	Tue Apr 29 08:35:34 2008
@@ -8,19 +8,19 @@
 -																			   DefaultScreenOfDisplay( (Display *) mpDisplay ),
 +																			   (Screen*) cairoHelperGetScreen( mpSysData ),
  																			   pFormat, width, height ) );
- #elif defined (CAIRO_HAS_WIN32_SURFACE)
- 			return new Surface( mpSysData, cairo_win32_surface_create_with_dib( nFormat, width, height ) );
+ 		} else
+ 			return new Surface( mpSysData, mpDisplay, 0, NULL, cairo_surface_create_similar( mpSurface, aContent, width, height ) );
 diff -rup canvas/source/cairo-orig/cairo_helper.cxx canvas/source/cairo/cairo_helper.cxx
 --- canvas/source/cairo-orig/cairo_helper.cxx	2008-04-28 18:00:30.000000000 +0200
 +++ canvas/source/cairo/cairo_helper.cxx	2008-04-28 18:11:31.000000000 +0200
 @@ -38,6 +38,7 @@
- #include "precompiled_canvas.hxx"
+ #include <X11/Xutil.h>
  
  #include <cairo.h>
 +#include <cairo_helper.hxx>
+ #include <cairo-xlib.h>
  
- #ifdef CAIRO_HAS_XLIB_SURFACE
- #include <vcl/sysdata.hxx>
+ #ifdef CAIRO_HAS_GLITZ_SURFACE
 @@ -63,9 +64,18 @@ using namespace ::cairo;
  
  //#define OOO_CANVAS_GLITZ 1