summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Balland-Poirier <laurent.balland-poirier@laposte.net>2016-07-15 09:57:42 +0200
committerLaurent BP <laurent.balland-poirier@laposte.net>2016-08-16 20:55:09 +0000
commitaa21f8acfa4d4997688ef4ddc04fcf95987e3424 (patch)
tree085ba6e4d07b8e61226b270ca807c2545fd5ffa9
parent428711f03c31802e339e57384b9f925a0e4dcc12 (diff)
tdf#100547 Save to ODF XY customized names
Trendline equation: Following change 27069 https://gerrit.libreoffice.org/27069 Save customized names of X and Y variables in extended ODF Change-Id: Ie39487866f7671f4468a37f48847038fbd2cec2a Reviewed-on: https://gerrit.libreoffice.org/27233 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
-rw-r--r--include/xmloff/xmltoken.hxx2
-rw-r--r--xmloff/source/chart/PropertyMap.hxx2
-rw-r--r--xmloff/source/core/xmltoken.cxx2
3 files changed, 6 insertions, 0 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 0a565917981b..1698737e6605 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2193,6 +2193,8 @@ namespace xmloff { namespace token {
XML_REGRESSION_PERIOD,
XML_REGRESSION_FORCE_INTERCEPT,
XML_REGRESSION_INTERCEPT_VALUE,
+ XML_REGRESSION_X_NAME,
+ XML_REGRESSION_Y_NAME,
XML_ERROR_INDICATOR,
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index e9f2634ae3d4..fc919ea30e36 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -217,6 +217,8 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY_ODF_EXT( "ExtrapolateBackward", LO_EXT, XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ),
MAP_ENTRY_ODF_EXT( "ForceIntercept", LO_EXT, XML_REGRESSION_FORCE_INTERCEPT, XML_TYPE_BOOL ),
MAP_ENTRY_ODF_EXT( "InterceptValue", LO_EXT, XML_REGRESSION_INTERCEPT_VALUE, XML_TYPE_DOUBLE ),
+ MAP_ENTRY_ODF_EXT( "XName", LO_EXT, XML_REGRESSION_X_NAME, XML_TYPE_STRING ),
+ MAP_ENTRY_ODF_EXT( "YName", LO_EXT, XML_REGRESSION_Y_NAME, XML_TYPE_STRING ),
// import mapping for broken files
MAP_ENTRY_ODF_EXT_IMPORT( "CurveName", CHART, XML_REGRESSION_CURVE_NAME, XML_TYPE_STRING ),
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index f6924bb0a918..ed6e22d127f5 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2201,6 +2201,8 @@ namespace xmloff { namespace token {
TOKEN( "regression-period", XML_REGRESSION_PERIOD ),
TOKEN( "regression-force-intercept", XML_REGRESSION_FORCE_INTERCEPT ),
TOKEN( "regression-intercept-value", XML_REGRESSION_INTERCEPT_VALUE ),
+ TOKEN( "regression-x-name", XML_REGRESSION_X_NAME ),
+ TOKEN( "regression-y-name", XML_REGRESSION_Y_NAME ),
TOKEN( "error-indicator", XML_ERROR_INDICATOR ),