diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-03 16:25:38 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-09-07 16:41:11 +0200 |
| commit | 24560df316de86cea93a37edd38e02a2f2d9c0c2 (patch) | |
| tree | 8c8ea23fe1fd417d320d9315224f81f3dda22b08 /include/oox/export | |
| parent | 5670937747c8391e098da6a8712324a0a5aaaa91 (diff) | |
Related: tdf#93676 unwanted duplicate axis title exported
translateFromChart2AxisIndexToOox toggles between just two
states, so convert consumers/suppliers of that to bool
Then in exportAxesId toggle between primary/seconday pairs based on that, vs
always exporting AXIS_PRIMARY_X + primary/secondary y
Change-Id: I2649f5fc07323a73a3a215fdc52d5f1a5c31c349
Diffstat (limited to 'include/oox/export')
| -rw-r--r-- | include/oox/export/chartexport.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index da434b120753..7a4f2f73d8b1 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -152,14 +152,14 @@ private: void exportHiLowLines(); void exportUpDownBars(css::uno::Reference< css::chart2::XChartType > xChartType ); - void exportAllSeries(css::uno::Reference<css::chart2::XChartType> xChartType, AxesType& rAttachedAxis); + void exportAllSeries(css::uno::Reference<css::chart2::XChartType> xChartType, bool& rPrimaryAxes); void exportSeries(css::uno::Reference< css::chart2::XChartType > xChartType, - css::uno::Sequence<css::uno::Reference<css::chart2::XDataSeries> >& rSeriesSeq, AxesType& rAttachedAxis ); + css::uno::Sequence<css::uno::Reference<css::chart2::XDataSeries> >& rSeriesSeq, bool& rPrimaryAxes); void exportCandleStickSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeriesSeq, - bool bJapaneseCandleSticks, AxesType& rAttachedAxis ); + bool bJapaneseCandleSticks, bool& rPrimaryAxes ); void exportSeriesText( const css::uno::Reference< css::chart2::data::XDataSequence >& xValueSeq ); void exportSeriesCategory( @@ -193,7 +193,7 @@ private: sal_Int32 nAxisType, const char* sAxisPos, const AxisIdPair& rAxisIdPair ); - void exportAxesId(AxesType nAttachedAxis); + void exportAxesId(bool bPrimaryAxes); void exportView3D(); bool isDeep3dChart(); |