diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-19 12:39:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-19 13:46:01 +0100 |
commit | f0f87108ab1560558c5b11185acc2bdfde150b8a (patch) | |
tree | 0956d440c14d31973eacb49dfe6ca53abd4780ff /chart2/source/controller/main/ChartController_Properties.cxx | |
parent | sw_fieldmarkhide: disable layout cache if there are fieldmarks (diff) | |
download | core-f0f87108ab1560558c5b11185acc2bdfde150b8a.tar.gz core-f0f87108ab1560558c5b11185acc2bdfde150b8a.zip |
use more concrete types in chart2, Diagram
Change-Id: I870f6d9fa4c0b51cf7c887199079fdbabbca1fec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128597
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller/main/ChartController_Properties.cxx')
-rw-r--r-- | chart2/source/controller/main/ChartController_Properties.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index f3a0d309cce7..0f8e4f1dfa43 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -44,6 +44,7 @@ #include <ChartModel.hxx> #include <ColorPerPointHelper.hxx> #include <DiagramHelper.hxx> +#include <Diagram.hxx> #include <ControllerLockGuard.hxx> #include "UndoGuard.hxx" #include <ObjectNameProvider.hxx> @@ -144,9 +145,6 @@ wrapper::ItemConverter* createItemConverter( if (pRefSizeProvider) pRefSize.reset( new awt::Size( pRefSizeProvider->getPageSize())); - uno::Reference< beans::XPropertySet > xDiaProp; - xDiaProp.set( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ), uno::UNO_QUERY ); - // the second property set contains the property CoordinateOrigin // nOriginIndex is the index of the corresponding index of the // origin (x=0, y=1, z=2) @@ -202,7 +200,7 @@ wrapper::ItemConverter* createItemConverter( uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( aObjectCID, xChartModel ); uno::Reference< XChartType > xChartType = ChartModelHelper::getChartTypeOfSeries( xChartModel, xSeries ); - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ) ); + rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ) ); sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram ); if( !ChartTypeHelper::isSupportingAreaProperties( xChartType, nDimensionCount ) ) eMapTo = wrapper::GraphicObjectType::LineDataPoint; @@ -376,14 +374,14 @@ OUString lcl_getAxisCIDForCommand( std::string_view rDispatchCommand, const rtl: nDimensionIndex=1; bMainAxis=false; } - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ) ); + rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ) ); uno::Reference< XAxis > xAxis( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) ); return ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, xChartModel ); } OUString lcl_getGridCIDForCommand( std::string_view rDispatchCommand, const rtl::Reference<::chart::ChartModel>& xChartModel ) { - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ) ); + rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram( uno::Reference<chart2::XChartDocument>(xChartModel) ) ); if( rDispatchCommand == "DiagramGridAll") return ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_GRID, u"ALLELEMENTS" ); |