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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Jul 17 12:09:19 2008
New Revision: 13271
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13271&view=rev

Log:
	* patches/dev300/apply: put emf+ patches into correct order again



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 17 12:09:19 2008
@@ -2280,7 +2280,6 @@
 emf+-canvas.diff
 emf+-cppcanvas.diff
 emf+-cppcanvas-polyaction.diff
-emf+-dxcanvas.diff
 cairocanvas-alpha-pixmap-rewrite.diff, rodo
 
 [ EMFPlus ]
@@ -2289,6 +2288,7 @@
 
 [ EMFPlus < dev300-m22 >= beb300-m1 ]
 emf+-cppcanvas-emfplus-m21.diff
+emf+-offapi.diff
 
 [ EMFPlus >= dev300-m22 ]
 emf+-cppcanvas-emfplus.diff
@@ -2299,6 +2299,7 @@
 
 [ EMFPlus < dev300-m22 >= beb300-m1 ]
 emf+-vcl-renderer-m21.diff
+emf+-dxcanvas.diff
 
 [ EMFPlus >= dev300-m22 ]
 emf+-vcl-renderer.diff
@@ -2313,10 +2314,6 @@
 emf+-embedded-mf-image.diff, rodo
 vcl-pluggable-mtf-renderer.diff, thorsten
 
-[ EMFPlus < dev300-m22 >= beb300-m1 ]
-SectionOwner => rodo
-emf+-offapi.diff
-
 [ LinkWarningDlg ]
 linkwarn-dlg-in-apps.diff, n#348149, thorsten
 linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten