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/PropertyMaps.cxx | |
| 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/PropertyMaps.cxx')
| -rw-r--r-- | xmloff/source/chart/PropertyMaps.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 1f8bd7809748..9a0f3eb77a83 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -28,8 +28,15 @@ #include <sax/tools/converter.hxx> -#include "XMLChartPropertySetMapper.hxx" #include "SchXMLTools.hxx" +#include "XMLChartPropertySetMapper.hxx" +#include "XMLErrorIndicatorPropertyHdl.hxx" +#include "XMLErrorBarStylePropertyHdl.hxx" +#include "XMLTextOrientationHdl.hxx" +#include "XMLSymbolTypePropertyHdl.hxx" +#include "XMLAxisPositionPropertyHdl.hxx" +#include "XMLRegressionTypePropertyHdl.hxx" + #include <xmloff/EnumPropertyHdl.hxx> #include <xmloff/XMLConstantsPropertyHandler.hxx> #include <xmloff/attrlist.hxx> @@ -39,17 +46,13 @@ #include <xmloff/NamedBoolPropertyHdl.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> -#include "XMLErrorIndicatorPropertyHdl.hxx" -#include "XMLErrorBarStylePropertyHdl.hxx" -#include "XMLTextOrientationHdl.hxx" -#include "XMLSymbolTypePropertyHdl.hxx" -#include "XMLAxisPositionPropertyHdl.hxx" -#include <com/sun/star/chart/ChartAxisMarks.hpp> -#include <com/sun/star/chart/ChartDataCaption.hpp> -#include <com/sun/star/chart/ChartSymbolType.hpp> + #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> +#include <com/sun/star/chart/ChartAxisMarks.hpp> +#include <com/sun/star/chart/ChartDataCaption.hpp> +#include <com/sun/star/chart/ChartSymbolType.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -116,8 +119,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 break; case XML_SCH_TYPE_REGRESSION_TYPE: - pHdl = new XMLEnumPropertyHdl( aXMLChartRegressionCurveTypeEnumMap, - ::getCppuType((const chart::ChartRegressionCurveType*)0) ); + pHdl = new XMLRegressionTypePropertyHdl( ); break; case XML_SCH_TYPE_ERROR_INDICATOR_LOWER: |