summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-09-04 09:08:34 +0000
committerRüdiger Timm <rt@openoffice.org>2008-09-04 09:08:34 +0000
commit10ff676cb261014fcd7467de16f52eebc7edac3a (patch)
tree507b6be6458695e93ee64e1c22f0737218c39cba /xmloff
parent47e17e87ee13eb3c8ef9a66700706d7b21040fa9 (diff)
INTEGRATION: CWS swenhancedfields2 (1.123.22); FILE MERGED
2008/08/04 15:02:41 b_michaelsen 1.123.22.3: RESYNC: (1.123-1.131); FILE MERGED 2008/05/07 09:54:57 ama 1.123.22.2: Patch #i33737#: Enhanced fields 2008/04/23 08:21:05 ama 1.123.22.1: #i33737#: Enhanced fields
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmltoken.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5601300d1dec..379637093793 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: xmltoken.cxx,v $
- * $Revision: 1.131 $
+ * $Revision: 1.132 $
*
* This file is part of OpenOffice.org.
*
@@ -3038,6 +3038,13 @@ namespace xmloff { namespace token {
TOKEN( "use-zero", XML_USE_ZERO ),
TOKEN( "ignore", XML_IGNORE ),
+ // enhanced fields
+ TOKEN( "fieldmark", XML_FIELDMARK ),
+ TOKEN( "fieldmark-start", XML_FIELDMARK_START ),
+ TOKEN( "fieldmark-end", XML_FIELDMARK_END ),
+ TOKEN( "urn:openoffice:names:experimental:ooo-ms-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