diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:19:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:19:25 +0000 |
| commit | 98c7f4b71b81bdf2201e4d94dec70f8ccc1c439d (patch) | |
| tree | 46da3bf6685a5b6c1c613cea8aef9adf0cab5861 /xmloff/source | |
| parent | 6590ea07a914a71366709376a137f57caf742de3 (diff) | |
INTEGRATION: CWS xmlbasic (1.68.12); FILE MERGED
2004/10/26 15:51:30 tbe 1.68.12.5: RESYNC: (1.69-1.70); FILE MERGED
2004/10/22 12:25:00 tbe 1.68.12.4: #i22747# XML filter adaptors and macros
2004/10/21 12:16:35 tbe 1.68.12.3: #i22747# XML filter adaptors and macros
2004/09/30 13:16:08 tbe 1.68.12.2: RESYNC: (1.68-1.69); FILE MERGED
2004/09/30 10:36:14 tbe 1.68.12.1: #i22747# XML filter adaptors and macros
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index e2d5ced15148..822c877a3778 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltoken.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: hr $ $Date: 2004-11-09 12:15:06 $ + * last change: $Author: hr $ $Date: 2004-11-09 13:19:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,7 +184,6 @@ namespace xmloff { namespace token { TOKEN( "in", XML_UNIT_INCH ), // any other -<<<<<<< xmltoken.cxx TOKEN( "1", XML_1 ), TOKEN( "10", XML_10 ), TOKEN( "2", XML_2 ), @@ -2539,6 +2538,10 @@ namespace xmloff { namespace token { TOKEN( "X", XML_uX ), TOKEN( "dlg", XML_NP_DLG ), TOKEN( "http://openoffice.org/2000/dialog", XML_N_DLG ), + TOKEN( "script-data", XML_SCRIPT_DATA ), + TOKEN( "libraries", XML_LIBRARIES ), + TOKEN( "source-code", XML_SOURCE_CODE ), + TOKEN( "readonly", XML_READONLY ), #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } |