diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-02 09:53:54 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-02 20:56:31 -0400 |
| commit | 6c4e21a234f12e1310ba06f9859e08b424acf8bf (patch) | |
| tree | 043739400b16c923a30b45e5bc1eff4490ee410f /sw | |
| parent | 5e2b7e37a29edf45f829ccee2302a942b54568a1 (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.
Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unochart.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/unocore/unochart.cxx | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index be1a674a39a8..a3689555468d 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -172,6 +172,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::chart2::data::XDataSequence> + SAL_CALL createDataSequenceByValueArray( + const OUString& aRole, const OUString& aRangeRepresentation ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XRangeXMLConversion virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index af47cb7928b0..0a34baf37207 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1432,6 +1432,14 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL SwChartDataProvider::getRangeS return uno::Reference< sheet::XRangeSelection >(); } +uno::Reference<css::chart2::data::XDataSequence> SAL_CALL + SwChartDataProvider::createDataSequenceByValueArray( + const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ ) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) +{ + return uno::Reference<css::chart2::data::XDataSequence>(); +} + void SAL_CALL SwChartDataProvider::dispose( ) throw (uno::RuntimeException, std::exception) { |