diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2022-01-25 20:17:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-25 20:23:08 +0100 |
commit | 39f452953e12e24350e7a3740129fa4930aedfca (patch) | |
tree | 4561622298ab522d07b87f404b565ae271273656 /chart2/source/model | |
parent | d1207a5f3a573dbe39a7874931ce373e5c88628d (diff) |
use more concrete types in chart2, Diagram
Change-Id: I40cd39d0878dc56e4e86e05149c9744cb563d745
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128942
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/model')
-rw-r--r-- | chart2/source/model/template/BarChartTypeTemplate.cxx | 5 | ||||
-rw-r--r-- | chart2/source/model/template/BarChartTypeTemplate.hxx | 2 | ||||
-rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.cxx | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 947df608c78b..4a46b502a2d0 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -288,11 +288,10 @@ void BarChartTypeTemplate::resetStyles( } void BarChartTypeTemplate::createCoordinateSystems( - const Reference< chart2::XCoordinateSystemContainer > & xCooSysCnt ) + const rtl::Reference< ::chart::Diagram > & xDiagram ) { - ChartTypeTemplate::createCoordinateSystems( xCooSysCnt ); + ChartTypeTemplate::createCoordinateSystems( xDiagram ); - Reference< chart2::XDiagram > xDiagram( xCooSysCnt, uno::UNO_QUERY ); DiagramHelper::setVertical( xDiagram, m_eBarDirection == HORIZONTAL ); } diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index af6e1096a7f1..6c5f66bd9cc3 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -85,7 +85,7 @@ protected: virtual bool isSwapXAndY() const override; virtual void createCoordinateSystems( - const css::uno::Reference< css::chart2::XCoordinateSystemContainer > & xCooSysCnt ) override; + const rtl::Reference< ::chart::Diagram > & xDiagram ) override; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 997de84ad302..0cb57443441a 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -489,9 +489,9 @@ bool ChartTypeTemplate::isSwapXAndY() const } void ChartTypeTemplate::createCoordinateSystems( - const Reference< chart2::XCoordinateSystemContainer > & xOutCooSysCnt ) + const rtl::Reference< ::chart::Diagram > & xDiagram ) { - if( ! xOutCooSysCnt.is()) + if( ! xDiagram.is()) return; std::vector< rtl::Reference< ChartType > > aFormerlyUsedChartTypes; rtl::Reference< ChartType > xChartType( getChartTypeForNewSeries(aFormerlyUsedChartTypes)); @@ -501,7 +501,7 @@ void ChartTypeTemplate::createCoordinateSystems( if( ! xCooSys.is()) { // chart type wants no coordinate systems - xOutCooSysCnt->setCoordinateSystems( Sequence< Reference< XCoordinateSystem > >()); + xDiagram->setCoordinateSystems( Sequence< Reference< XCoordinateSystem > >()); return; } // #i69680# make grid of first y-axis visible (was in the CooSys CTOR before) @@ -513,7 +513,7 @@ void ChartTypeTemplate::createCoordinateSystems( } Sequence< Reference< XCoordinateSystem > > aCoordinateSystems( - xOutCooSysCnt->getCoordinateSystems()); + xDiagram->getCoordinateSystems()); if( aCoordinateSystems.hasElements()) { @@ -550,7 +550,7 @@ void ChartTypeTemplate::createCoordinateSystems( // set new coordinate systems aCoordinateSystems = { xCooSys }; - xOutCooSysCnt->setCoordinateSystems( aCoordinateSystems ); + xDiagram->setCoordinateSystems( aCoordinateSystems ); } void ChartTypeTemplate::adaptScales( |