diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-26 16:42:33 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-27 06:02:30 +0200 |
commit | d09e1505086ec775b5521f58927def50fabd0865 (patch) | |
tree | 20d31bacb399d3bbdb01e2a6d5f6f4aca272d951 | |
parent | cd8cb0df5f10405b514597404d9d5455d4f7c5db (diff) |
add support for axis color import/export
Change-Id: I713981b9ae1a82ca0b014cde88abdc32af1f9975
-rw-r--r-- | sc/source/filter/xml/xmlcondformat.cxx | 11 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 1 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 3 | ||||
-rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 1 | ||||
-rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 |
6 files changed, 20 insertions, 1 deletions
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 6aa55ccd5028..a8fc8bb95159 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -193,6 +193,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ rtl::OUString sGradient; rtl::OUString sAxisPosition; rtl::OUString sShowValue; + rtl::OUString sAxisColor; sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarAttrMap(); @@ -221,6 +222,9 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ case XML_TOK_DATABAR_SHOWVALUE: sShowValue = sValue; break; + case XML_TOK_DATABAR_AXISCOLOR: + sAxisColor = sValue; + break; default: break; } @@ -253,6 +257,13 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_ else mpFormatData->mbNeg = false; + if(!sAxisColor.isEmpty()) + { + sal_Int32 nColor = 0; + sax::Converter::convertColor( nColor, sAxisColor ); + mpFormatData->maAxisColor = Color(nColor); + } + if(!sShowValue.isEmpty()) { bool bShowValue = true; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index ab01286313ec..6b91c2e34884 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3971,6 +3971,10 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) rtl::OUStringBuffer aBuffer; ::sax::Converter::convertColor(aBuffer, pFormatData->maPositiveColor.GetColor()); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_POSITIVE_COLOR, aBuffer.makeStringAndClear()); + + aBuffer = rtl::OUStringBuffer(); + ::sax::Converter::convertColor(aBuffer, pFormatData->maAxisColor.GetColor()); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, aBuffer.makeStringAndClear()); SvXMLElementExport aElementDataBar(*this, XML_NAMESPACE_CALC_EXT, XML_DATA_BAR, true, true); { diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 32e3e94ec830..bf7c18b795f2 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -726,6 +726,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataBarAttrMap() { XML_NAMESPACE_CALC_EXT, XML_GRADIENT, XML_TOK_DATABAR_GRADIENT }, { XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, XML_TOK_DATABAR_AXISPOSITION }, { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE, XML_TOK_DATABAR_SHOWVALUE }, + { XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, XML_TOK_DATABAR_AXISCOLOR }, XML_TOKEN_MAP_END }; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 541987b59c8a..3e9bd2d3613e 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -198,7 +198,8 @@ enum ScXMLDataBarAttrTokens XML_TOK_DATABAR_NEGATIVE_COLOR, XML_TOK_DATABAR_GRADIENT, XML_TOK_DATABAR_AXISPOSITION, - XML_TOK_DATABAR_SHOWVALUE + XML_TOK_DATABAR_SHOWVALUE, + XML_TOK_DATABAR_AXISCOLOR }; enum ScXMLDataBarEntryAttrTokens diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index b850e3e64291..e45091eeaff5 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -288,6 +288,7 @@ namespace xmloff { namespace token { XML_AUTOSIZE, XML_AVERAGE, XML_AXIS, + XML_AXIS_COLOR, XML_BACK_SCALE, XML_BACKFACE_CULLING, XML_BACKGROUND, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 5296cae27c8d..875d0d933fb9 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -292,6 +292,7 @@ namespace xmloff { namespace token { TOKEN( "autosize", XML_AUTOSIZE ), TOKEN( "average", XML_AVERAGE ), TOKEN( "axis", XML_AXIS ), + TOKEN( "axis-color", XML_AXIS_COLOR ), TOKEN( "back-scale", XML_BACK_SCALE ), TOKEN( "backface-culling", XML_BACKFACE_CULLING ), TOKEN( "background", XML_BACKGROUND ), |