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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Aug  5 23:21:22 2008
New Revision: 13480
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13480&view=rev

Log:
        * patches/dev300/cws-layoutdialogs-transex3-ooo300.diff: add OOO300
          version, the file there has the license header now (and for m29,
          the whole cws is integrated anyway)


Added:
   trunk/patches/dev300/cws-layoutdialogs-transex3-ooo300.diff
      - copied, changed from r13478, /trunk/patches/dev300/cws-layoutdialogs-transex3.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug  5 23:21:22 2008
@@ -1873,7 +1873,11 @@
 cws-layoutdialogs-sw.diff
 cws-layoutdialogs-toolkit.diff
 cws-layoutdialogs-toolkit-remove-paragraph.diff
+
+[ LayoutDialogs < dev300-m29 < ooo300-m0 ]
 cws-layoutdialogs-transex3.diff
+[ LayoutDialogs < dev300-m0 >= ooo300-m1 ]
+cws-layoutdialogs-transex3-ooo300.diff
 
 [ LayoutDialogs ]
 # make it build with dev300-m19 - Janneke, please check :-)

Copied: trunk/patches/dev300/cws-layoutdialogs-transex3-ooo300.diff (from r13478, /trunk/patches/dev300/cws-layoutdialogs-transex3.diff)
==============================================================================
--- /trunk/patches/dev300/cws-layoutdialogs-transex3.diff	(original)
+++ trunk/patches/dev300/cws-layoutdialogs-transex3-ooo300.diff	Tue Aug  5 23:21:22 2008
@@ -223,38 +223,7 @@
 diff -p -u -u -p -b -w -B -r1.2 -r1.2.2.8
 --- transex3/layout/tralay.cxx	6 Mar 2008 12:36:58 -0000	1.2
 +++ transex3/layout/tralay.cxx	30 Jul 2008 11:29:33 -0000	1.2.2.8
-@@ -1,6 +1,39 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ * 
-+ * Copyright 2008 by Sun Microsystems, Inc.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org.  If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
+@@ -32,6 +32,8 @@
  #include <com/sun/star/xml/sax/SAXException.hpp>
  #include <transex3/vosapp.hxx>