ooo-build r11596 - in trunk: . patches/dev300 patches/src680

[jannieuw svn gnome org]

Author: jannieuw
Date: Fri Feb 15 16:10:42 2008
New Revision: 11596
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11596&view=rev

Log:
2008-02-15  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/src680/cws-layout-toolkit.diff: Bugfix for --disable layout.  Add target
	in workben/layout.  Thanks kendy!


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/src680/apply
   trunk/patches/src680/cws-layout-toolkit.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Feb 15 16:10:42 2008
@@ -1890,12 +1890,12 @@
 cws-awtfixes1.diff, i#78291, i#80754
 
 [ Layout ]
-SectionOwner => jannie
+SectionOwner => janniew
 cws-layout-svtools.diff
 
 
 [ LayoutDialogs]
-SectionOwner => jannie
+SectionOwner => janniew
 cws-layout-config_office.diff
 cws-layout-offapi.diff
 cws-layout-scp2.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Feb 15 16:10:42 2008
@@ -1902,16 +1902,16 @@
 
 
 [ Layout < ooh680-m2]
-SectionOwner => jannie
+SectionOwner => janniew
 cws-awtfixes1.diff, i#78291, i#80754
 
 [ Layout ]
-SectionOwner => jannie
+SectionOwner => janniew
 cws-layout-svtools.diff
 
 
 [ LayoutDialogs]
-SectionOwner => jannie
+SectionOwner => janniew
 cws-layout-config_office.diff
 cws-layout-offapi.diff
 cws-layout-scp2.diff

Modified: trunk/patches/src680/cws-layout-toolkit.diff
==============================================================================
--- trunk/patches/src680/cws-layout-toolkit.diff	(original)
+++ trunk/patches/src680/cws-layout-toolkit.diff	Fri Feb 15 16:10:42 2008
@@ -18463,7 +18463,7 @@
 diff -N toolkit/workben/layout/makefile.mk
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ toolkit/workben/layout/makefile.mk	14 Feb 2008 15:26:29 -0000	1.1.2.4
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,95 @@
 +PRJ=../..
 +PRJNAME=toolkit
 +TARGET=test
@@ -18556,7 +18556,9 @@
 +	# FIXME: broken setup
 +	ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx 
 +
-+.ENDIF # ENABLE_LAYOUT == TRUE
++.ELSE # ENABLE_LAYOUT != TRUE
++all .PHONY:
++.ENDIF # ENABLE_LAYOUT != TRUE
 Index: toolkit/workben/layout/non-interactable-containers.xml
 ===================================================================
 RCS file: toolkit/workben/layout/non-interactable-containers.xml