diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-02-09 14:41:17 +0100 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-02-09 14:41:17 +0100 |
commit | 1c8baf771feb977f145f322cf44f06fc1785ba25 (patch) | |
tree | 02c57708dde2d7526d0d90ab7ff127bfea28cf1f /xmloff/inc/xmloff | |
parent | 70f69149ccd6252065eeee05b51d181793721969 (diff) | |
parent | 96e51b8bbf37c085eb993a79396264c9a9f8a495 (diff) |
cbosdo02: merging changesets up to DEV300_m71
Diffstat (limited to 'xmloff/inc/xmloff')
-rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index daca654692..738105740d 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -147,6 +147,9 @@ namespace xmloff { namespace token { // ODF Enhanced namespaces XML_NP_OFFICE_EXT, XML_N_OFFICE_EXT, + + XML_NP_TABLE_EXT, + XML_N_TABLE_EXT, // units XML_UNIT_MM, @@ -520,6 +523,7 @@ namespace xmloff { namespace token { XML_DATA_LABEL_SYMBOL, XML_DATA_LABEL_TEXT, XML_DATA_PILOT_FIELD, + XML_DATA_PILOT_GRAND_TOTAL, XML_DATA_PILOT_LEVEL, XML_DATA_PILOT_MEMBER, XML_DATA_PILOT_MEMBERS, |