diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-02 09:53:54 -0400 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-03 09:29:13 +0000 |
| commit | 2a5fbd9e48c33734bd44c56ac5742f913cd63df4 (patch) | |
| tree | 4d958536229da012f0058bcfcce3eb0800b5a82c /include | |
| parent | 7ba14f3fa86d1a5fbb04ca35dcb2fd1439a4223e (diff) | |
bnc#812796: Correctly handle static value array for OOXML charts.
We need to pass the role of the data sequence in order to avoid unreliable
guess work when importing static value array.
Also, not all Excel's scatter plots have real numeric X values; some have
textural X values in which case Excel switch to generating 1, 2, 3, ... as
X values. When importing to our chart implementation, using "categories" role
in such cases instead of "values-x" results in a more faithful chart rendering.
(cherry picked from commit 6c4e21a234f12e1310ba06f9859e08b424acf8bf)
Conflicts:
chart2/source/inc/InternalDataProvider.hxx
chart2/source/tools/InternalDataProvider.cxx
Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78
Reviewed-on: https://gerrit.libreoffice.org/10040
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/chart/chartconverter.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index 4807655bd25e..bbfe0ed4290f 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -83,10 +83,10 @@ public: /** Creates a data sequence from a formula. Dummy implementation. Derived classes have to override this function to actually parse the formula. */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > - createDataSequence( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& rxDataProvider, - const DataSequenceModel& rDataSeq ); + virtual css::uno::Reference<css::chart2::data::XDataSequence> + createDataSequence( + const css::uno::Reference<css::chart2::data::XDataProvider>& rxDataProvider, + const DataSequenceModel& rDataSeq, const OUString& rRole ); private: ChartConverter( const ChartConverter& ); |