From 836c40904f4424a5b7ae708171a7aab53141761a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 19 Jul 2019 09:50:11 +0200 Subject: loplugin:referencecasting in canvas..chart2 Change-Id: I3a3671b5c44d1a7e5ca320d3d76dd5d902382cbc Reviewed-on: https://gerrit.libreoffice.org/75935 Tested-by: Jenkins Reviewed-by: Noel Grandin --- chart2/source/tools/AxisHelper.cxx | 2 +- chart2/source/tools/DiagramHelper.cxx | 14 ++++++-------- chart2/source/tools/InternalDataProvider.cxx | 2 +- chart2/source/tools/OPropertySet.cxx | 3 +-- chart2/source/tools/ObjectIdentifier.cxx | 4 ++-- chart2/source/tools/ReferenceSizeProvider.cxx | 4 ++-- chart2/source/tools/TitleHelper.cxx | 2 +- 7 files changed, 14 insertions(+), 17 deletions(-) (limited to 'chart2/source/tools') diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index 8339c8ff1ceb..25d481bff352 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -507,7 +507,7 @@ void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, co std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); for (auto const& series : aSeriesVector) { - uno::Reference< chart2::XAxis > xCurrentAxis( DiagramHelper::getAttachedAxis(series, xDiagram ), uno::UNO_QUERY ); + uno::Reference< chart2::XAxis > xCurrentAxis = DiagramHelper::getAttachedAxis(series, xDiagram ); if( xCurrentAxis==xAxis ) { bOtherSeriesAttachedToThisAxis = true; diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 7720089ecbaa..39307cb11240 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -1069,12 +1069,11 @@ void lcl_switchToTextCategories( const Reference< XChartDocument >& xChartDoc, c void DiagramHelper::switchToDateCategories( const Reference< XChartDocument >& xChartDoc ) { - Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); - if(xChartModel.is()) + if(xChartDoc.is()) { - ControllerLockGuardUNO aCtrlLockGuard( xChartModel ); + ControllerLockGuardUNO aCtrlLockGuard( xChartDoc ); - Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) ); + Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartDoc ) ); if( xCooSys.is() ) { Reference< XAxis > xAxis( xCooSys->getAxisByDimension(0,0) ); @@ -1085,12 +1084,11 @@ void DiagramHelper::switchToDateCategories( const Reference< XChartDocument >& x void DiagramHelper::switchToTextCategories( const Reference< XChartDocument >& xChartDoc ) { - Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); - if(xChartModel.is()) + if(xChartDoc.is()) { - ControllerLockGuardUNO aCtrlLockGuard( xChartModel ); + ControllerLockGuardUNO aCtrlLockGuard( xChartDoc ); - Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartModel ) ); + Reference< chart2::XCoordinateSystem > xCooSys( ChartModelHelper::getFirstCoordinateSystem( xChartDoc ) ); if( xCooSys.is() ) { Reference< XAxis > xAxis( xCooSys->getAxisByDimension(0,0) ); diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 5bea86b2d7d3..c520760fa557 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -316,7 +316,7 @@ InternalDataProvider::InternalDataProvider( Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartDoc ) ); if( xDiagram.is()) { - Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY ); + Reference< frame::XModel > xChartModel = xChartDoc; //data in columns? { diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index b18653887969..859dbcfdf757 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -270,8 +270,7 @@ void SAL_CALL OPropertySet::getFastPropertyValue uno::Reference< beans::XPropertySet > xPropSet( xStylePropSet, uno::UNO_QUERY ); if( xPropSet.is()) { - uno::Reference< beans::XPropertySetInfo > xInfo( xPropSet->getPropertySetInfo(), - uno::UNO_QUERY ); + uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); if( xInfo.is() ) { // for some reason the virtual method getInfoHelper() is diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 7e0064e411cd..cfd7bb4cedec 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -1187,7 +1187,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( const Reference< chart2::XChartDocument >& xChartDocument ) { return ObjectIdentifier::getObjectPropertySet( - rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY )); + rObjectCID, Reference< frame::XModel >( xChartDocument )); } Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( @@ -1322,7 +1322,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( errorBar = "ErrorBarZ"; xSeriesProp->getPropertyValue( errorBar ) >>= xErrorBarProp; - xObjectProperties.set( xErrorBarProp, uno::UNO_QUERY ); + xObjectProperties = xErrorBarProp; } } break; diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 524a2ac84621..7cd07d911703 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -229,7 +229,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState return eResult; // diagram is needed by the rest of the objects - Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartDoc ), uno::UNO_QUERY ); + Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xChartDoc ); if( ! xDiagram.is()) return eResult; @@ -317,7 +317,7 @@ void ReferenceSizeProvider::setAutoResizeState( ReferenceSizeProvider::AutoResiz impl_setValuesAtTitled( Reference< XTitled >( m_xChartDoc, uno::UNO_QUERY )); // diagram is needed by the rest of the objects - Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDoc ), uno::UNO_QUERY ); + Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( m_xChartDoc ); if( ! xDiagram.is()) return; diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index c6b95d8c238a..c384d03b08e7 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -145,7 +145,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn if(nTitleIndex == TitleHelper::MAIN_TITLE) return rModel.getTitleObject(); - uno::Reference< XDiagram > xDiagram( rModel.getFirstDiagram(), uno::UNO_QUERY ); + uno::Reference< XDiagram > xDiagram = rModel.getFirstDiagram(); uno::Reference< XTitled > xTitled( lcl_getTitleParent( nTitleIndex, xDiagram ) ); if( xTitled.is()) return xTitled->getTitleObject(); -- cgit v1.2.3