ooo-build r12375 - in trunk: . patches/dev300

[rodo svn gnome org]

Author: rodo
Date: Tue Apr 29 12:35:16 2008
New Revision: 12375
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12375&view=rev

Log:
2008-04-29  Radek Doulik  <rodo novell com>

	* patches/dev300/apply: added
	cairocanvas-fix-after-win32-removeval.diff, fixed build problem
	after win32 cairo patches



Added:
   trunk/patches/dev300/cairocanvas-fix-after-win32-removeval.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 29 12:35:16 2008
@@ -228,6 +228,7 @@
 
 # fix build in cairo
 buildfix-cairo.diff, i#88260, thorsten
+cairocanvas-fix-after-win32-removeval.diff, rodo
 
 [ CJK ]
 #set default CJK font fontsize as 10.5pt

Added: trunk/patches/dev300/cairocanvas-fix-after-win32-removeval.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cairocanvas-fix-after-win32-removeval.diff	Tue Apr 29 12:35:16 2008
@@ -0,0 +1,33 @@
+diff -rup canvas/source/cairo-old/cairo_cairo.hxx canvas/source/cairo/cairo_cairo.hxx
+--- canvas/source/cairo-old/cairo_cairo.hxx	2008-04-29 14:25:54.000000000 +0200
++++ canvas/source/cairo/cairo_cairo.hxx	2008-04-29 14:27:39.000000000 +0200
+@@ -47,13 +47,11 @@ namespace cairo {
+ #if defined QUARTZ
+         // nothing needed
+ #elif defined (CAIRO_HAS_XLIB_SURFACE)
+-    #ifdef USE_CAIRO10_APIS
+ 		const void* mpSysData;
+ 		void* mpDisplay;
+ 		long mhDrawable;
+ 		void *mpRenderFormat;
+ 		bool mbFreePixmap;
+-    #endif
+ #elif defined (CAIRO_HAS_WIN32_SURFACE)
+         // nothing needed
+ #endif
+@@ -93,7 +91,6 @@ namespace cairo {
+ 
+         
+ #if defined(CAIRO_HAS_XLIB_SURFACE) && !defined (QUARTZ)
+-    #if defined USE_CAIRO10_APIS
+ 		long getPixmap()
+ 		{
+ 			return mhDrawable;
+@@ -108,7 +105,6 @@ namespace cairo {
+         {
+             mbFreePixmap = false;
+         }
+-    #endif
+ 
+         int getXFormat( Content aContent );
+