chart2/source/controller/main/ElementSelector.cxx | 2 +- chart2/source/inc/DataSeriesHelper.hxx | 4 ++-- chart2/source/tools/DataSeriesHelper.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 59b6ffb3812fee3ed3d92602c31bc836efbee319 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Wed Jan 26 20:41:50 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Jan 28 08:20:14 2022 +0100 use more concrete types in chart2, BaseCoordinateSystem Change-Id: I28b2af18ebd073701b4f8d3e9161d242396ce44a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129055 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index e56da4fc6173..b4488295ebd9 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -288,7 +288,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat Reference< frame::XController > xChartController; rEvent.State >>= xChartController; ::chart::ChartController* pController = dynamic_cast<::chart::ChartController*>(xChartController.get()); - assert(pController); + assert(!xChartController || pController); m_apSelectorListBox->SetChartController( pController ); m_apSelectorListBox->UpdateChartElementsListAndSelection(); } diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 866fa7c54e9f..8d2e7e3d5672 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -104,7 +104,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence( OOO_DLLPUBLIC_CHARTTOOLS void setStackModeAtSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > & aSeries, - const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, + const rtl::Reference< ::chart::BaseCoordinateSystem > & xCorrespondingCoordinateSystem, StackMode eStackMode ); OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex( @@ -113,7 +113,7 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getAttachedAxisIndex( /// @param nAxisIndex, if -1 it is determined by the given data series via getAttachedAxisIndex OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getNumberFormatKeyFromAxis( const css::uno::Reference< css::chart2::XDataSeries > & xSeries, - const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, + const rtl::Reference< ::chart::BaseCoordinateSystem > & xCorrespondingCoordinateSystem, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex = -1 ); diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index a4b626830d1e..bdf391bf5922 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -378,7 +378,7 @@ OUString getDataSeriesLabel( void setStackModeAtSeries( const Sequence< Reference< chart2::XDataSeries > > & aSeries, - const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, + const rtl::Reference< BaseCoordinateSystem > & xCorrespondingCoordinateSystem, StackMode eStackMode ) { const uno::Any aPropValue( @@ -460,7 +460,7 @@ sal_Int32 getAttachedAxisIndex( const Reference< chart2::XDataSeries > & xSeries sal_Int32 getNumberFormatKeyFromAxis( const Reference< chart2::XDataSeries > & xSeries, - const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, + const rtl::Reference< BaseCoordinateSystem > & xCorrespondingCoordinateSystem, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex /* = -1 */ ) {