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 05:59:50 +0200 |
| commit | 064bfb1aab1b207a37a602f155f3b3c15cef60b4 (patch) | |
| tree | e44356c866d1c6db0798f90b6a69909fa6a5d3a0 /sc | |
| parent | support colored axis in data bars (diff) | |
| download | core-064bfb1aab1b207a37a602f155f3b3c15cef60b4.tar.gz core-064bfb1aab1b207a37a602f155f3b3c15cef60b4.zip | |
add support for axis color import/export
Change-Id: I713981b9ae1a82ca0b014cde88abdc32af1f9975
Diffstat (limited to 'sc')
| -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 |
4 files changed, 18 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 1bfe20014265..5cd559427bb2 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3963,6 +3963,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 5d1d99a9376f..01e1d1cbbe82 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -723,6 +723,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 891b9ba19607..624d7816ae32 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -197,7 +197,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 |