diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-06-02 22:22:43 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-07-03 21:46:41 +0200 |
| commit | d070003bc43e19ef22a737202d018d8c9712b80e (patch) | |
| tree | 878b7fa479abb113cc1b590ace70b4ddb3872f3b /xmloff/source/chart/PropertyMap.hxx | |
| parent | f65a9efc9abadaa804d1c4e2a26a5c95bd3cd555 (diff) | |
Refactor regression curve handling in xmloff import to use chart2.
Additionally support more regression curves per one series and
add polynomial an moving average tokens.
Conflicts:
xmloff/source/chart/SchXMLPlotAreaContext.cxx
Change-Id: I9dfebb1f47942c88ab0ccff48ec7632136fb1bc9
Diffstat (limited to 'xmloff/source/chart/PropertyMap.hxx')
| -rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index f19b36593e72..a5f1bd2e25d6 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/chart/ChartAxisMarkPosition.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/ChartErrorIndicatorType.hpp> -#include <com/sun/star/chart/ChartRegressionCurveType.hpp> #include <com/sun/star/chart/ChartSolidType.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> @@ -184,7 +183,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY( "ShowNegativeError", CHART, XML_ERROR_LOWER_INDICATOR, XML_TYPE_BOOL), MAP_ENTRY( "ErrorBarStyle", CHART, XML_ERROR_CATEGORY, XML_SCH_TYPE_ERROR_BAR_STYLE ), MAP_ENTRY( "PercentageError", CHART, XML_ERROR_PERCENTAGE, XML_TYPE_DOUBLE ), - MAP_ENTRY( "RegressionCurves", CHART, XML_REGRESSION_TYPE, XML_SCH_TYPE_REGRESSION_TYPE ), + MAP_ENTRY( "RegressionType", CHART, XML_REGRESSION_TYPE, XML_SCH_TYPE_REGRESSION_TYPE ), MAP_SPECIAL_ODF12( "ErrorBarRangePositive", CHART, XML_ERROR_UPPER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only MAP_SPECIAL_ODF12( "ErrorBarRangeNegative", CHART, XML_ERROR_LOWER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only @@ -256,17 +255,6 @@ SvXMLEnumMapEntry aXMLChartErrorBarStyleEnumMap[] = { ::xmloff::token::XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry aXMLChartRegressionCurveTypeEnumMap[] = -{ - { ::xmloff::token::XML_NONE, ::com::sun::star::chart::ChartRegressionCurveType_NONE }, - { ::xmloff::token::XML_LINEAR, ::com::sun::star::chart::ChartRegressionCurveType_LINEAR }, - { ::xmloff::token::XML_LOGARITHMIC, ::com::sun::star::chart::ChartRegressionCurveType_LOGARITHM }, - { ::xmloff::token::XML_EXPONENTIAL, ::com::sun::star::chart::ChartRegressionCurveType_EXPONENTIAL }, - { ::xmloff::token::XML_POLYNOMIAL, ::com::sun::star::chart::ChartRegressionCurveType_POLYNOMIAL }, - { ::xmloff::token::XML_POWER, ::com::sun::star::chart::ChartRegressionCurveType_POWER }, - { ::xmloff::token::XML_TOKEN_INVALID, 0 } -}; - SvXMLEnumMapEntry aXMLChartSolidTypeEnumMap[] = { { ::xmloff::token::XML_CUBOID, ::com::sun::star::chart::ChartSolidType::RECTANGULAR_SOLID }, |