diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 18:49:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-28 18:49:22 +0000 |
| commit | c3352ab9f73c2cbc3d85f402d34ec872b2cd0201 (patch) | |
| tree | 55fc95ad6548cffe07cae50b46c1919acae2e86f /xmloff/source/core/xmltoken.cxx | |
| parent | 584c22e84a255e6674a6594f31e8c59bf84fbb73 (diff) | |
| parent | 0da599b7c13bc138962e2c3dcbe9284773a1d9d6 (diff) | |
koheidatapilot03: merge with DEV300_m56
Diffstat (limited to 'xmloff/source/core/xmltoken.cxx')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 8c0dc183b5..b8e57a62e8 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -146,9 +146,11 @@ namespace xmloff { namespace token { TOKEN( "of", XML_NP_OF ), TOKEN( "urn:oasis:names:tc:opendocument:xmlns:of:1.2", XML_N_OF ), - // ODF 1.2 metadata: RDFa - TOKEN( "rdfa", XML_NP_RDFA ), - TOKEN( "http://docs.oasis-open.org/opendocument/meta/rdfa#", XML_N_RDFA ), + // ODF 1.2 metadata: RDFa and GRDDL + TOKEN( "xhtml", XML_NP_XHTML ), + TOKEN( "http://www.w3.org/1999/xhtml", XML_N_XHTML ), + TOKEN( "grddl", XML_NP_GRDDL ), + TOKEN( "http://www.w3.org/2003/g/data-view#", XML_N_GRDDL ), // units TOKEN( "mm", XML_UNIT_MM ), @@ -3044,6 +3046,7 @@ namespace xmloff { namespace token { TOKEN( "meta-field", XML_META_FIELD ), TOKEN( "about", XML_ABOUT ), TOKEN( "datatype", XML_DATATYPE ), + TOKEN( "transformation", XML_TRANSFORMATION ), // ODF 1.2 numbered-paragraph TOKEN( "list-id", XML_LIST_ID ), @@ -3080,6 +3083,13 @@ namespace xmloff { namespace token { TOKEN( "mathweight", XML_MATHWEIGHT ), TOKEN( "mathcolor", XML_MATHCOLOR ), + TOKEN( "contains", XML_CONTAINS ), + TOKEN( "does-not-contain", XML_DOES_NOT_CONTAIN ), + TOKEN( "begins-with", XML_BEGINS_WITH ), + TOKEN( "does-not-begin-with", XML_DOES_NOT_BEGIN_WITH ), + TOKEN( "ends-with", XML_ENDS_WITH ), + TOKEN( "does-not-end-with", XML_DOES_NOT_END_WITH ), + #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } #else |