diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2010-10-05 11:24:49 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-10-05 11:24:49 -0400 |
commit | 2efcf2da2055ad1cb3b00031b19145f8b104b122 (patch) | |
tree | 3da09abcea30ffcc4b3160bcbe8fde8f97d3696b /xmloff/inc | |
parent | e0185db43409456a5ccf47bd1f879888a5b04783 (diff) |
Ported calc-distributed-cell-text-*.diff from ooo-build.
This feature enables horizontal 'distributed' alignment and vertical
'justified' and 'distributed' alignments for cell contents in Calc.
Note that this feature relies on ODF 1.2 extended in order for the
relevant cell attributes to be saved in ODS.
Diffstat (limited to 'xmloff/inc')
-rw-r--r-- | xmloff/inc/xmlnmspe.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmlnmspe.hxx index 7b7b7e131ec7..ae194cfbf770 100644 --- a/xmloff/inc/xmlnmspe.hxx +++ b/xmloff/inc/xmlnmspe.hxx @@ -104,6 +104,6 @@ XML_OLD_NAMESPACE( META, 6U ) // experimental namespaces XML_NAMESPACE( FIELD, 100U ) - +XML_NAMESPACE( CSS3TEXT, 103U ) // CSS Text Level 3 #endif // _XMLOFF_XMLNMSPE_HXX diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 1c0b88f5d691..a2606ea12b96 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -148,9 +148,14 @@ namespace xmloff { namespace token { XML_NP_TABLE_EXT, XML_N_TABLE_EXT, + XML_NP_DRAW_EXT, XML_N_DRAW_EXT, + // css text level 3 + XML_NP_CSS3TEXT, + XML_N_CSS3TEXT, + // units XML_UNIT_MM, XML_UNIT_M, @@ -606,6 +611,7 @@ namespace xmloff { namespace token { XML_DISTANCE, XML_DISTANCE_AFTER_SEP, XML_DISTANCE_BEFORE_SEP, + XML_DISTRIBUTE, XML_DISTRIBUTE_LETTER, XML_DISTRIBUTE_SPACE, XML_DIVIDE, @@ -1776,6 +1782,7 @@ namespace xmloff { namespace token { XML_TEXT_GLOBAL, XML_TEXT_INDENT, XML_TEXT_INPUT, + XML_TEXT_JUSTIFY, XML_TEXT_OUTLINE, XML_TEXT_POSITION, XML_TEXT_ROTATION_ANGLE, @@ -1909,6 +1916,7 @@ namespace xmloff { namespace token { XML_VERSION_LIST, XML_VERTICAL, XML_VERTICAL_ALIGN, + XML_VERTICAL_JUSTIFY, XML_VERTICAL_LINES, XML_VERTICAL_POS, XML_VERTICAL_REL, |