add support for axis color import/export

Change-Id: I713981b9ae1a82ca0b014cde88abdc32af1f9975

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 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
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 ),