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/transporttypes.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/transporttypes.hxx')
| -rw-r--r-- | xmloff/source/chart/transporttypes.hxx | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index 92efcae36400..65afd19eaa27 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -151,6 +151,23 @@ struct GlobalSeriesImportInfo sal_Int32 nFirstSecondDomainIndex; }; +struct RegressionStyle +{ + com::sun::star::uno::Reference< + com::sun::star::chart2::XDataSeries > m_xSeries; + com::sun::star::uno::Reference< + com::sun::star::beans::XPropertySet > m_xEquationProperties; + + OUString msStyleName; + + RegressionStyle(const com::sun::star::uno::Reference< + com::sun::star::chart2::XDataSeries >& xSeries, + OUString sStyleName) : + m_xSeries ( xSeries ), + msStyleName ( sStyleName ) + {} +}; + struct DataRowPointStyle { enum StyleType @@ -158,21 +175,22 @@ struct DataRowPointStyle DATA_POINT, DATA_SERIES, MEAN_VALUE, - REGRESSION, ERROR_INDICATOR }; StyleType meType; - ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > m_xSeries; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xOldAPISeries; + com::sun::star::uno::Reference< + com::sun::star::chart2::XDataSeries > m_xSeries; + + com::sun::star::uno::Reference< + com::sun::star::beans::XPropertySet > m_xOldAPISeries; + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > m_xErrorXProperties; + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > m_xErrorYProperties; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > m_xEquationProperties; + sal_Int32 m_nPointIndex; sal_Int32 m_nPointRepeat; OUString msStyleName; @@ -181,8 +199,8 @@ struct DataRowPointStyle bool mbSymbolSizeForSeriesIsMissingInFile; DataRowPointStyle( StyleType eType - , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries + , const com::sun::star::uno::Reference< + com::sun::star::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex , sal_Int32 nPointRepeat , OUString sStyleName |