diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2011-09-09 15:02:34 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-09-20 12:14:13 -0400 |
| commit | 3e5edf6ca9d3bc56549602bda2adc855dd57f658 (patch) | |
| tree | 51e8993e730ff7f17721c4b8c126fc92ab92bb34 /xmloff | |
| parent | 53abf4dc1c065fba3ec9e691cacd55aceaf19fc7 (diff) | |
Add missing chart data point ODF1.2 standard symbols
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 6 | ||||
| -rw-r--r-- | xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/transform/StyleOASISTContext.cxx | 14 | ||||
| -rw-r--r-- | xmloff/source/transform/StyleOOoTContext.cxx | 21 |
5 files changed, 54 insertions, 0 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index a923f467ea2d..746e75d63d31 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -3139,6 +3139,12 @@ namespace xmloff { namespace token { XML_MARGIN, // #i117001# + // regina, ODF1.2 additional symbols in charts + XML_STAR, + XML_ASTERISK, + XML_HORIZONTAL_BAR, + XML_VERTICAL_BAR, + XML_TOKEN_END }; diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx index 4eba27eb4307..c284c57e96f1 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -63,6 +63,13 @@ SvXMLSignedEnumMapEntry aXMLChartSymbolNameMap[] = { XML_ARROW_LEFT, 5 }, { XML_BOW_TIE, 6 }, { XML_HOURGLASS, 7 }, + { XML_CIRCLE, 8 }, + { XML_STAR, 9 }, + { XML_X, 10 }, + { XML_PLUS, 11 }, + { XML_ASTERISK, 12 }, + { XML_HORIZONTAL_BAR, 13 }, + { XML_VERTICAL_BAR, 14 }, { XML_TOKEN_INVALID, 0 } }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index b07e77a9bedf..45bcc35d82bf 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3137,6 +3137,12 @@ namespace xmloff { namespace token { TOKEN( "margin", XML_MARGIN), + // regina, ODF1.2 additional symbols in charts + TOKEN( "star", XML_STAR ), + TOKEN( "asterisk", XML_ASTERISK ), + TOKEN( "horizontal-bar", XML_HORIZONTAL_BAR ), + TOKEN( "vertical-bar", XML_VERTICAL_BAR ), + #if OSL_DEBUG_LEVEL > 0 { 0, NULL, NULL, XML_TOKEN_END } #else diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 2ef42bf0dfe2..b6e361f9754e 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -389,6 +389,20 @@ void XMLPropertiesTContext_Impl::StartElement( nSymbolType = 6; else if( IsXMLToken( rAttrValue, XML_HOURGLASS )) nSymbolType = 7; + else if( IsXMLToken( rAttrValue, XML_CIRCLE )) + nSymbolType = 8; + else if( IsXMLToken( rAttrValue, XML_STAR )) + nSymbolType = 9; + else if( IsXMLToken( rAttrValue, XML_X )) + nSymbolType = 10; + else if( IsXMLToken( rAttrValue, XML_PLUS )) + nSymbolType = 11; + else if( IsXMLToken( rAttrValue, XML_ASTERISK )) + nSymbolType = 12; + else if( IsXMLToken( rAttrValue, XML_HORIZONTAL_BAR )) + nSymbolType = 13; + else if( IsXMLToken( rAttrValue, XML_VERTICAL_BAR )) + nSymbolType = 14; if( nSymbolType >= 0 ) pAttrList->AddAttribute( diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index f74ebdeeda31..88cff6bbf080 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -772,6 +772,27 @@ void XMLPropertiesOOoTContext_Impl::StartElement( case 7: eToken = XML_HOURGLASS; break; + case 8: + eToken = XML_CIRCLE; + break; + case 9: + eToken = XML_STAR; + break; + case 10: + eToken = XML_X; + break; + case 11: + eToken = XML_PLUS; + break; + case 12: + eToken = XML_ASTERISK; + break; + case 13: + eToken = XML_HORIZONTAL_BAR; + break; + case 14: + eToken = XML_VERTICAL_BAR; + break; default: OSL_FAIL( "invalid named symbol" ); break; |