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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sat Jul 12 11:02:25 2008
New Revision: 13171
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13171&view=rev

Log:
2008-07-12  Rene Engelhard  <rene debiaran org>

        * patches/dev300/controls-with-images-in-document.diff: revert last
          change - creates a circular dependency
        * patches/deb300/apply: temporarily disable above pat


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/controls-with-images-in-document.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Jul 12 11:02:25 2008
@@ -1536,7 +1536,7 @@
 #make properties available for non class modules
 #also allow paramaters to be supported for Get properties
 vba-support-properties-inmodules.diff
-controls-with-images-in-document.diff, i#38215, noelpwer 
+#controls-with-images-in-document.diff, i#38215, noelpwer 
 
 # FIXME: disabled now (mmeeks) - needs porting to m22.
 [ VBAObjects < dev300-m22 >= beb300-m1 ]

Modified: trunk/patches/dev300/controls-with-images-in-document.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-in-document.diff	(original)
+++ trunk/patches/dev300/controls-with-images-in-document.diff	Sat Jul 12 11:02:25 2008
@@ -298,14 +298,6 @@
  	
  	return xRet;
  }
---- toolkit/prj/build.lst-old	2008-07-12 12:09:49.000000000 +0200
-+++ toolkit/prj/build.lst	2008-07-12 12:10:06.000000000 +0200
-@@ -1,4 +1,4 @@
--ti	toolkit	:	vcl NULL
-+ti	toolkit	:	vcl goodies NULL
- ti	toolkit									usr1	-	all	ti_mkout NULL
- ti	toolkit\prj								get		-	all	ti_prj NULL
- ti	toolkit\inc								nmake	-	all	ti_inc NULL
 diff --git toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx
 index 72c7db8..dc3f12c 100644
 --- toolkit/inc/toolkit/controls/unocontrols.hxx