diff options
| author | Regina Henschel <regina@apache.org> | 2012-05-19 19:27:41 +0000 |
|---|---|---|
| committer | Regina Henschel <regina@apache.org> | 2012-05-19 19:27:41 +0000 |
| commit | 94754eb3c4b9dc2b721ea05db9bae655bb16cc04 (patch) | |
| tree | 298ef06784e5e17edf2c4c40294ab588a38d7e6f /xmloff | |
| parent | a06ccbd905e7829c310bca0b1b244da5fa2d4981 (diff) | |
Add missing chart data point ODF1.2 standard symbols
Notes
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 e8e1b8a27ff9..677438411171 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -3130,6 +3130,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 1e2feeba7dc3..d61376fc23c4 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -58,6 +58,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 17f62003397a..0a75ac531af5 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3130,6 +3130,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 d5b34b40b098..bdbbaefc31a6 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -386,6 +386,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 a9db4ba12a6a..52710e7282b4 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -771,6 +771,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_ENSURE( false, "invalid named symbol" ); break; |