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/itemsetwrapper/SeriesOptionsItemConverter.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/itemsetwrapper/SeriesOptionsItemConverter.cxx')
-rw-r--r-- | chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index c531e7e2c76e..f4a1014743b0 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -23,6 +23,7 @@ #include <ChartModelHelper.hxx> #include <AxisHelper.hxx> #include <DiagramHelper.hxx> +#include <Diagram.hxx> #include <ChartTypeHelper.hxx> #include <DataSeriesHelper.hxx> #include <ChartModel.hxx> @@ -71,8 +72,7 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( m_bAttachToMainAxis = DiagramHelper::isSeriesAttachedToMainAxis( xDataSeries ); - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram(xChartModel) ); - uno::Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY ); + rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram(xChartModel) ); uno::Reference< XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram , xDataSeries ) ); m_xCooSys = DataSeriesHelper::getCoordinateSystemOfSeries( xDataSeries, xDiagram ); @@ -109,21 +109,21 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( } m_bSupportingBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount ); - if( m_bSupportingBarConnectors && xDiagramProperties.is() ) + if( m_bSupportingBarConnectors && xDiagram.is() ) { - xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= m_bConnectBars; + xDiagram->getPropertyValue( "ConnectBars" ) >>= m_bConnectBars; } m_bSupportingAxisSideBySide = ChartTypeHelper::isSupportingAxisSideBySide( xChartType, nDimensionCount ); - if( m_bSupportingAxisSideBySide && xDiagramProperties.is() ) + if( m_bSupportingAxisSideBySide && xDiagram.is() ) { - xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis; + xDiagram->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis; } m_bSupportingStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType ); if( m_bSupportingStartingAngle ) { - xDiagramProperties->getPropertyValue( "StartingAngle" ) >>= m_nStartingAngle; + xDiagram->getPropertyValue( "StartingAngle" ) >>= m_nStartingAngle; } m_aSupportedMissingValueTreatments = ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ); @@ -140,7 +140,7 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( xProp->getPropertyValue( "IncludeHiddenCells" ); //if not exception is thrown the property is offered m_bSupportingPlottingOfHiddenCells = true; - xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= m_bIncludeHiddenCells; + xDiagram->getPropertyValue( "IncludeHiddenCells" ) >>= m_bIncludeHiddenCells; } catch( const beans::UnknownPropertyException& ) { @@ -205,7 +205,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf aPropName = "OverlapSequence"; uno::Reference< XDataSeries > xDataSeries( GetPropertySet(), uno::UNO_QUERY ); - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram(m_xChartModel) ); + rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram(m_xChartModel) ); uno::Reference< beans::XPropertySet > xChartTypeProps( DiagramHelper::getChartTypeOfSeries( xDiagram , xDataSeries ), uno::UNO_QUERY ); if( xChartTypeProps.is() ) { @@ -241,7 +241,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf if( m_bSupportingBarConnectors ) { bool bOldConnectBars = false; - uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); + rtl::Reference< Diagram > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() && (xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= bOldConnectBars) && bOldConnectBars != m_bConnectBars ) @@ -260,7 +260,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf if( m_bSupportingAxisSideBySide ) { bool bOldGroupBarsPerAxis = true; - uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); + rtl::Reference< Diagram > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() && (xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= bOldGroupBarsPerAxis) && bOldGroupBarsPerAxis != m_bGroupBarsPerAxis ) @@ -277,7 +277,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf if( m_bSupportingStartingAngle ) { m_nStartingAngle = static_cast< const SdrAngleItem & >( rItemSet.Get( nWhichId )).GetValue().get() / 100; - uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); + rtl::Reference< Diagram > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() ) { xDiagramProperties->setPropertyValue( "StartingAngle" , uno::Any(m_nStartingAngle) ); @@ -314,7 +314,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf { try { - uno::Reference< beans::XPropertySet > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); + rtl::Reference< Diagram > xDiagramProperties( ChartModelHelper::findDiagram(m_xChartModel), uno::UNO_QUERY ); if( xDiagramProperties.is() ) { xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::Any( nNew )); |