[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/xmloff xmloff/source

[Tomaž Vajngerl]

 include/xmloff/xmltoken.hxx         |    1 +
 xmloff/source/chart/PropertyMap.hxx |    1 +
 xmloff/source/core/xmltoken.cxx     |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit 18aef30e3eef7e2d4027ac4c9e1f5915755d288e
Author: Tomaž Vajngerl <quikee at gmail.com>
Date:   Sat Nov 23 18:09:33 2013 +0100

    Support regression curve name in ODF.
    
    Change-Id: Ic065d63eee507906febfa15eb6d5ae1e7de58280
    Reviewed-on: https://gerrit.libreoffice.org/6874
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Reviewed-by: Thorsten Behrens <thb at documentfoundation.org>
    Tested-by: Thorsten Behrens <thb at documentfoundation.org>

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index bb585c6..f9196af 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2158,6 +2158,7 @@ namespace xmloff { namespace token {
 
         XML_REGRESSION_CURVE,
         XML_REGRESSION_TYPE,
+        XML_REGRESSION_CURVE_NAME,
         XML_REGRESSION_EXTRAPOLATE_FORWARD,
         XML_REGRESSION_EXTRAPOLATE_BACKWARD,
         XML_REGRESSION_MAX_DEGREE,
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index 4bab098..a1efee2 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -185,6 +185,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
     // regression curve properties
     MAP_SPECIAL( "RegressionType", CHART, XML_REGRESSION_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE ),
 
+    MAP_ENTRY_ODF_EXT( "CurveName", CHART, XML_REGRESSION_CURVE_NAME, XML_TYPE_STRING ),
     MAP_ENTRY_ODF_EXT( "PolynomialDegree", CHART, XML_REGRESSION_MAX_DEGREE, XML_TYPE_NUMBER ),
     MAP_ENTRY_ODF_EXT( "MovingAveragePeriod", CHART, XML_REGRESSION_PERIOD, XML_TYPE_NUMBER ),
     MAP_ENTRY_ODF_EXT( "MovingAverageType", CHART, XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING ),
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index dedb2b4..431e778 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2168,6 +2168,7 @@ namespace xmloff { namespace token {
         TOKEN( "regression-curve",                XML_REGRESSION_CURVE ),
         TOKEN( "regression-type",                 XML_REGRESSION_TYPE ),
         // Extended regression curve properties - ODF 1.2 extended
+        TOKEN( "regression-name",                 XML_REGRESSION_CURVE_NAME ),
         TOKEN( "regression-extrapolate-forward",  XML_REGRESSION_EXTRAPOLATE_FORWARD ),
         TOKEN( "regression-extrapolate-backward", XML_REGRESSION_EXTRAPOLATE_BACKWARD ),
         TOKEN( "regression-max-degree",           XML_REGRESSION_MAX_DEGREE ),