ooo-build r11452 - in trunk: . patches/cairo

[tml svn gnome org]

Author: tml
Date: Tue Jan 29 23:57:47 2008
New Revision: 11452
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11452&view=rev

Log:
2008-01-30  Tor Lillqvist  <tml novell com>

	* patches/cairo/cairo-canvas-win32.diff: Adapt for ooh680-m5:
	Remove fuzz.



Modified:
   trunk/ChangeLog
   trunk/patches/cairo/cairo-canvas-win32.diff

Modified: trunk/patches/cairo/cairo-canvas-win32.diff
==============================================================================
--- trunk/patches/cairo/cairo-canvas-win32.diff	(original)
+++ trunk/patches/cairo/cairo-canvas-win32.diff	Tue Jan 29 23:57:47 2008
@@ -59,7 +59,7 @@
 dummy line to avoid confusing diff-mode
 --- canvas/source/cairo/cairo_cairo.hxx
 +++ canvas/source/cairo/cairo_cairo.hxx
-@@ -1,6 +1,8 @@
+@@ -1,9 +1,13 @@
  #ifndef _CAIROCANVAS_CAIRO_HXX
  #define _CAIROCANVAS_CAIRO_HXX
  
@@ -67,7 +67,12 @@
 +
  namespace cairo {
  
++#ifdef CAIRO_HAS_XLIB_SURFACE
+         bool HasXRender( const void* pSysData );
++#endif
+ 
  #include <cairo.h>
+ 
 @@ -15,15 +15,25 @@
  
  	class Surface {
@@ -114,8 +119,8 @@
  		void Resize( int width, int height );
 dummy line to avoid confusing diff-mode
 --- canvas/source/cairo/cairo_cairo.cxx
-+++ canvas/source/cairo/cairo_cairo.cxx
-@@ -36,16 +36,36 @@
++++ canvas/source/cairo/cairo_cairo.cxx 
+@@ -36,23 +36,45 @@
  
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_canvas.hxx"
@@ -150,6 +155,15 @@
 +#include <cairo-win32.h>
 +#endif
  
++#ifdef CAIRO_HAS_XLIB_SURFACE
+ 	bool HasXRender( const void* pSysData )
+ 	{
+ 	        Display *pDisplay = (Display*) cairoHelperGetDisplay( pSysData );
+ 	        int nDummy;
+ 	        return XQueryExtension( pDisplay, "RENDER", &nDummy, &nDummy, &nDummy );
+ 	}
++#endif
+ 
    /**
     * Surface::Surface:   Create Canvas surface with existing data
 @@ -58,11 +58,19 @@