ooo-build r11338 - trunk/patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Mon Jan 21 13:31:30 2008
New Revision: 11338
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11338&view=rev

Log:
2008-01-21  Petr Mladek  <pmladek suse cz>

	* patches/src680/xmloff-field-patch.diff: fix to build xmloff;
	  the hunk was applied at a wrong place


Modified:
   trunk/patches/src680/xmloff-field-patch.diff

Modified: trunk/patches/src680/xmloff-field-patch.diff
==============================================================================
--- trunk/patches/src680/xmloff-field-patch.diff	(original)
+++ trunk/patches/src680/xmloff-field-patch.diff	Mon Jan 21 13:31:30 2008
@@ -212,18 +212,16 @@
 *** xmloff/source/core/xmltoken.cxx	3 Aug 2007 12:53:36 -0000	1.110
 --- xmloff/source/core/xmltoken.cxx	21 Jan 2008 08:29:22 -0000
 ***************
-*** 2951,2956 ****
---- 2951,2963 ----
-          TOKEN( "soft-page-break",                 XML_SOFT_PAGE_BREAK ),
-          TOKEN( "use-soft-page-breaks",            XML_USE_SOFT_PAGE_BREAKS ),
-  
-+         TOKEN( "fieldmark",                        XML_FIELDMARK ),
-+         TOKEN( "fieldmark-start",                    XML_FIELDMARK_START ),
-+         TOKEN( "fieldmark-end",                    XML_FIELDMARK_END ),
-+ 		TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:field:1.0",   XML_N_FIELD ),
-+ 		TOKEN( "field",                     XML_NP_FIELD ),
-+ 
-+ 
+*** 2994,2999 ****
+--- 2994,3004 ----
+          TOKEN( "character-set",         XML_CHARACTER_SET ),
+          TOKEN( "application-connection-settings",         XML_APPLICATION_CONNECTION_SETTINGS ),
+          TOKEN( "table-include-filter",         XML_TABLE_INCLUDE_FILTER ),
++         TOKEN( "fieldmark",             XML_FIELDMARK ),
++         TOKEN( "fieldmark-start",       XML_FIELDMARK_START ),
++         TOKEN( "fieldmark-end",         XML_FIELDMARK_END ),
++         TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:field:1.0",   XML_N_FIELD ),
++         TOKEN( "field",         XML_NP_FIELD ),
   #if OSL_DEBUG_LEVEL > 0
           { 0, NULL, NULL,                       XML_TOKEN_END }
   #else