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

[thorstenb svn gnome org]

Author: thorstenb
Date: Tue Jul 15 15:58:38 2008
New Revision: 13227
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13227&view=rev

Log:
	 * patches/dev300/apply: a bunch of cairocanvas/emf+ stuff is
	   upstream 


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 15 15:58:38 2008
@@ -2251,32 +2251,32 @@
 goodies-eps-filter-unix.diff, n#200053, rodo
 xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
 
-[ EMFPlus ]
+[ EMFPlus < dev300-m22 >= beb300-m1 ]
 SectionOwner => rodo
 emf+-canvas.diff
-emf+-canvas-line-width.diff
-emf+-canvas-vcl-clear.diff
-emf+-canvas-smooth-poly.diff
-emf+-canvas-vcl-non-closed-polygons.diff
 emf+-cppcanvas.diff
+emf+-cppcanvas-polyaction.diff
+emf+-dxcanvas.diff
+cairocanvas-alpha-pixmap-rewrite.diff, rodo
+
+[ EMFPlus ]
+SectionOwner => rodo
 emf+-cppcanvas-renderer.diff
 emf+-cppcanvas-emfplus.diff
-emf+-cppcanvas-polyaction.diff
 emf+-offapi-renderer.diff
 emf+-vcl-bitmap.diff
 emf+-vcl-renderer.diff
 emf+-svtools.diff
 emf+-scp2-renderer.diff
-emf+-dxcanvas.diff
 emf+-crash-fix.diff, n#361534, rodo
 vcl-grey-alpha-unix-sal-bitmap.diff, rodo
-cairocanvas-alpha-pixmap-rewrite.diff, rodo
 emf+-multipart-objects.diff, rodo
 emf+-use-canvas-only-for-emf+.diff, rodo
 emf+-embedded-mf-image.diff, rodo
 vcl-pluggable-mtf-renderer.diff, thorsten
 
 [ EMFPlus < dev300-m22 >= beb300-m1 ]
+SectionOwner => rodo
 emf+-offapi.diff
 
 [ LinkWarningDlg ]