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

[tml svn gnome org]

Author: tml
Date: Fri Feb  8 15:36:13 2008
New Revision: 11539
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11539&view=rev

Log:
2008-02-08  Tor Lillqvist  <tml novell com>

	* patches/cairo/cairo-canvas-win32.diff: Add patch to
	canvas/source/cairo/cairo_spritecanvas.cxx that bypasses use of
	HasXRender() unless CAIRO_HAS_XLIB_SURFACE.



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	Fri Feb  8 15:36:13 2008
@@ -643,3 +643,17 @@
  		cairo_matrix_t aOrigMatrix;
  		cairo_get_matrix( pCairo, &aOrigMatrix );
 dummy line to avoid confusing diff-mode
+--- canvas/source/cairo/cairo_spritecanvas.cxx
++++ canvas/source/cairo/cairo_spritecanvas.cxx
+@@ -100,9 +100,11 @@
+         CHECK_AND_THROW( pOutputWindow != NULL, 
+                          "SpriteCanvas::SpriteCanvas: invalid Window pointer" );
+ 
++#ifdef CAIRO_HAS_XLIB_SURFACE
+         bool bHasXRender = HasXRender( cairocanvas::GetSysData(pOutputWindow) );
+         CHECK_AND_THROW( bHasXRender == true, 
+                          "SpriteCanvas::SpriteCanvas: No RENDER extension" );
++#endif
+ 
+         Size aPixelSize( pOutputWindow->GetOutputSizePixel() );
+         const ::basegfx::B2ISize aSize( aPixelSize.Width(),