diff options
Diffstat (limited to 'chart2/source/tools')
-rw-r--r-- | chart2/source/tools/AxisHelper.cxx | 8 | ||||
-rw-r--r-- | chart2/source/tools/DiagramHelper.cxx | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 2418ca2097b0..046822980bc0 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -1148,7 +1148,7 @@ void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem >& try { //reverse direction for horizontal main axis - Reference< chart2::XAxis > xHorizontalMainAxis( AxisHelper::getAxis( nHorizontalAxisDimension, MAIN_AXIS_INDEX, xCooSys ) ); + rtl::Reference< Axis > xHorizontalMainAxis = AxisHelper::getAxis( nHorizontalAxisDimension, MAIN_AXIS_INDEX, xCooSys ); if( xHorizontalMainAxis.is() ) { chart2::ScaleData aScale = xHorizontalMainAxis->getScaleData(); @@ -1157,7 +1157,7 @@ void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem >& } //mathematical direction for vertical main axis - Reference< chart2::XAxis > xVerticalMainAxis( AxisHelper::getAxis( nVerticalAxisDimension, MAIN_AXIS_INDEX, xCooSys ) ); + rtl::Reference< Axis > xVerticalMainAxis = AxisHelper::getAxis( nVerticalAxisDimension, MAIN_AXIS_INDEX, xCooSys ); if( xVerticalMainAxis.is() ) { chart2::ScaleData aScale = xVerticalMainAxis->getScaleData(); @@ -1173,7 +1173,7 @@ void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem >& try { //reverse direction for horizontal secondary axis - Reference< chart2::XAxis > xHorizontalSecondaryAxis( AxisHelper::getAxis( nHorizontalAxisDimension, SECONDARY_AXIS_INDEX, xCooSys ) ); + rtl::Reference< Axis > xHorizontalSecondaryAxis = AxisHelper::getAxis( nHorizontalAxisDimension, SECONDARY_AXIS_INDEX, xCooSys ); if( xHorizontalSecondaryAxis.is() ) { chart2::ScaleData aScale = xHorizontalSecondaryAxis->getScaleData(); @@ -1182,7 +1182,7 @@ void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem >& } //mathematical direction for vertical secondary axis - Reference< chart2::XAxis > xVerticalSecondaryAxis( AxisHelper::getAxis( nVerticalAxisDimension, SECONDARY_AXIS_INDEX, xCooSys ) ); + rtl::Reference< Axis > xVerticalSecondaryAxis = AxisHelper::getAxis( nVerticalAxisDimension, SECONDARY_AXIS_INDEX, xCooSys ); if( xVerticalSecondaryAxis.is() ) { chart2::ScaleData aScale = xVerticalSecondaryAxis->getScaleData(); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 867e047ca1dd..f1021442f617 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -523,7 +523,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis sal_Int32 nNewAxisIndex = bAttachToMainAxis ? 0 : 1; sal_Int32 nOldAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries); - uno::Reference< chart2::XAxis > xOldAxis( DiagramHelper::getAttachedAxis( xDataSeries, xDiagram ) ); + rtl::Reference< Axis > xOldAxis = DiagramHelper::getAttachedAxis( xDataSeries, xDiagram ); if( nOldAxisIndex != nNewAxisIndex ) { @@ -674,13 +674,13 @@ rtl::Reference< ChartType > namespace { -std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram( +std::vector< rtl::Reference< Axis > > lcl_getAxisHoldingCategoriesFromDiagram( const rtl::Reference< Diagram > & xDiagram ) { - std::vector< Reference< XAxis > > aRet; + std::vector< rtl::Reference< Axis > > aRet; // return first x-axis as fall-back - Reference< XAxis > xFallBack; + rtl::Reference< Axis > xFallBack; if (xDiagram.is()) try { for( rtl::Reference< BaseCoordinateSystem > const & xCooSys : xDiagram->getBaseCoordinateSystems() ) @@ -701,7 +701,7 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram( aRet.push_back(xAxis); } if( (nN == 0) && !xFallBack.is()) - xFallBack.set( xAxis ); + xFallBack = xAxis; } } } @@ -758,10 +758,10 @@ void DiagramHelper::setCategoriesToDiagram( bool bSetAxisType /* = false */, bool bCategoryAxis /* = true */ ) { - std::vector< Reference< chart2::XAxis > > aCatAxes( + std::vector< rtl::Reference< Axis > > aCatAxes( lcl_getAxisHoldingCategoriesFromDiagram( xDiagram )); - for (const Reference< chart2::XAxis >& xCatAxis : aCatAxes) + for (const rtl::Reference< Axis >& xCatAxis : aCatAxes) { if( xCatAxis.is()) { @@ -787,12 +787,12 @@ uno::Reference< chart2::data::XLabeledDataSequence > try { - std::vector< Reference< chart2::XAxis > > aCatAxes( + std::vector< rtl::Reference< Axis > > aCatAxes( lcl_getAxisHoldingCategoriesFromDiagram( xDiagram )); //search for first categories if (!aCatAxes.empty()) { - Reference< chart2::XAxis > xCatAxis(aCatAxes[0]); + rtl::Reference< Axis > xCatAxis(aCatAxes[0]); if( xCatAxis.is()) { ScaleData aScaleData( xCatAxis->getScaleData()); |