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/qa/extras/chart2dump/chart2dump.cxx | 7 ++--- chart2/qa/extras/chart2import.cxx | 11 +++---- .../controller/accessibility/AccessibleBase.cxx | 6 ++-- .../chartapiwrapper/ChartDataWrapper.cxx | 6 ++-- .../chartapiwrapper/ChartDocumentWrapper.cxx | 24 +++++++-------- .../chartapiwrapper/DataSeriesPointWrapper.cxx | 4 +-- .../controller/chartapiwrapper/LegendWrapper.cxx | 4 +-- .../controller/chartapiwrapper/TitleWrapper.cxx | 6 ++-- .../dialogs/ChartTypeDialogController.cxx | 8 ++--- .../source/controller/dialogs/DataBrowserModel.cxx | 8 ++--- chart2/source/controller/dialogs/DialogModel.cxx | 13 ++++---- .../controller/dialogs/ObjectNameProvider.cxx | 16 +++++----- .../controller/dialogs/RangeSelectionHelper.cxx | 4 +-- chart2/source/controller/dialogs/tp_ChartType.cxx | 5 ++- .../drawinglayer/ViewElementListProvider.cxx | 3 +- chart2/source/controller/main/ChartController.cxx | 9 ++---- .../controller/main/ChartController_Insert.cxx | 36 +++++++++++----------- .../controller/main/ChartController_Properties.cxx | 2 +- .../controller/main/ChartController_Tools.cxx | 2 +- .../controller/main/ControllerCommandDispatch.cxx | 4 +-- .../controller/main/StatusBarCommandDispatch.cxx | 5 +-- .../source/controller/sidebar/ChartAxisPanel.cxx | 8 ++--- .../source/controller/sidebar/ChartSeriesPanel.cxx | 24 +++++++-------- chart2/source/model/filter/XMLFilter.cxx | 7 ++--- chart2/source/model/main/ChartModel.cxx | 2 +- 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 +- chart2/source/view/main/ShapeFactory.cxx | 7 ++--- 33 files changed, 121 insertions(+), 141 deletions(-) (limited to 'chart2') diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index af40472536bf..a2474a2a3453 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -253,17 +253,16 @@ protected: uno::Reference getShapeByName(const uno::Reference& rShapes, const OUString& rName, bool (*pCondition)(const uno::Reference&) = nullptr) { - uno::Reference XIndexAccess(rShapes, uno::UNO_QUERY); - for (sal_Int32 i = 0; i < XIndexAccess->getCount(); ++i) + for (sal_Int32 i = 0; i < rShapes->getCount(); ++i) { - uno::Reference xShapes(XIndexAccess->getByIndex(i), uno::UNO_QUERY); + uno::Reference xShapes(rShapes->getByIndex(i), uno::UNO_QUERY); if (xShapes.is()) { uno::Reference xRet = getShapeByName(xShapes, rName, pCondition); if (xRet.is()) return xRet; } - uno::Reference xNamedShape(XIndexAccess->getByIndex(i), uno::UNO_QUERY); + uno::Reference xNamedShape(rShapes->getByIndex(i), uno::UNO_QUERY); if (xNamedShape->getName() == rName) { uno::Reference xShape(xNamedShape, uno::UNO_QUERY); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 569ba8388d26..107daed69fea 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -230,17 +230,16 @@ getShapeByName(const uno::Reference& rShapes, const OUString& const std::function&)>& pCondition = nullptr) { - uno::Reference XIndexAccess(rShapes, uno::UNO_QUERY); - for (sal_Int32 i = 0; i < XIndexAccess->getCount(); ++i) + for (sal_Int32 i = 0; i < rShapes->getCount(); ++i) { - uno::Reference xShapes(XIndexAccess->getByIndex(i), uno::UNO_QUERY); + uno::Reference xShapes(rShapes->getByIndex(i), uno::UNO_QUERY); if (xShapes.is()) { uno::Reference xRet = getShapeByName(xShapes, rName, pCondition); if (xRet.is()) return xRet; } - uno::Reference xNamedShape(XIndexAccess->getByIndex(i), uno::UNO_QUERY); + uno::Reference xNamedShape(rShapes->getByIndex(i), uno::UNO_QUERY); if (xNamedShape->getName() == rName) { uno::Reference xShape(xNamedShape, uno::UNO_QUERY); @@ -961,7 +960,7 @@ void Chart2ImportTest::testTransparentBackground(OUString const & filename) uno::Reference< chart::XChartDocument > xChart2Doc (xChartDoc, uno::UNO_QUERY); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChart2Doc.is()); - Reference< beans::XPropertySet > xPropSet( xChart2Doc->getArea(), uno::UNO_QUERY); + Reference< beans::XPropertySet > xPropSet = xChart2Doc->getArea(); CPPUNIT_ASSERT_MESSAGE("failed to get Area", xPropSet.is()); css::drawing::FillStyle aStyle; @@ -1982,7 +1981,7 @@ void Chart2ImportTest::testTdf122765() { // The horizontal position of the slices was wrong. load("/chart2/qa/extras/data/pptx/", "tdf122765.pptx"); - Reference xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY); + Reference xChartDoc = getChartDocFromDrawImpress(0, 0); Reference xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index ff1008abedd9..a42792a67d88 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -732,9 +732,9 @@ Color AccessibleBase::getColor( eColorType eColType ) aObjectCID = ObjectIdentifier::createClassifiedIdentifierForParticle( aParentParticle ); } - xObjProp.set( + xObjProp = ObjectIdentifier::getObjectPropertySet( - aObjectCID, Reference< chart2::XChartDocument >( m_aAccInfo.m_xChartDocument )), uno::UNO_QUERY ); + aObjectCID, Reference< chart2::XChartDocument >( m_aAccInfo.m_xChartDocument )); if( xObjProp.is()) { try @@ -773,7 +773,7 @@ Color AccessibleBase::getColor( eColorType eColType ) } bool bTransparent = m_bAlwaysTransparent; - Reference< beans::XPropertySetInfo > xInfo( xObjProp->getPropertySetInfo(), uno::UNO_QUERY ); + Reference< beans::XPropertySetInfo > xInfo = xObjProp->getPropertySetInfo(); if( xInfo.is() && xInfo->hasPropertyByName( aStylePropName )) { diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 67492264b60f..80b9ed8a77dd 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -504,7 +504,7 @@ void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequen void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); - ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); + ControllerLockGuardUNO aCtrlLockGuard( xChartDoc ); lcl_DateCategoriesOperator aOperator( rDates ); applyData( aOperator ); DiagramHelper::switchToDateCategories( xChartDoc ); @@ -625,7 +625,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) uno::Sequence< sal_Int32 > aSequenceMapping; DataSourceHelper::detectRangeSegmentation( - uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ), + xChartDoc, aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ); if( !bHasCategories && rDataOperator.setsCategories( bUseColumns ) ) @@ -636,7 +636,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) ); // -- locked controllers - ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); + ControllerLockGuardUNO aCtrlLockGuard( xChartDoc ); // create and attach new data source switchToInternalDataProvider(); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index c413fd514daa..c0d3f469cad0 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -646,7 +646,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() { if( !m_xTitle.is() ) { - ControllerLockGuardUNO aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY )); + ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChart2Document() ); m_xTitle = new TitleWrapper( TitleHelper::MAIN_TITLE, m_spChart2ModelContact ); } return m_xTitle; @@ -656,7 +656,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() { if( !m_xSubTitle.is() ) { - ControllerLockGuardUNO aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY )); + ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChart2Document() ); m_xSubTitle = new TitleWrapper( TitleHelper::SUB_TITLE, m_spChart2ModelContact ); } return m_xSubTitle; @@ -747,7 +747,7 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x if( !xNewData.is() ) return; - ControllerLockGuardUNO aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY )); + ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChart2Document() ); m_xChartData.set( new ChartDataWrapper( m_spChart2ModelContact, xNewData ) ); } @@ -961,8 +961,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const uno::Reference< drawing::XShapes > xFoundShapes; uno::Reference< drawing::XDrawPage > xDrawPage( impl_getDrawPage() ); - uno::Reference< drawing::XShapes > xDrawPageShapes( xDrawPage, uno::UNO_QUERY ); - if( !xDrawPageShapes.is() ) + if( !xDrawPage.is() ) return xFoundShapes; uno::Reference xChartRoot( DrawModelWrapper::getChartRootShape( xDrawPage ) ); @@ -970,11 +969,11 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const // iterate 'flat' over all top-level objects // and determine all that are no chart objects std::vector< uno::Reference< drawing::XShape > > aShapeVector; - sal_Int32 nSubCount = xDrawPageShapes->getCount(); + sal_Int32 nSubCount = xDrawPage->getCount(); uno::Reference< drawing::XShape > xShape; for( sal_Int32 nS = 0; nS < nSubCount; nS++ ) { - if( xDrawPageShapes->getByIndex( nS ) >>= xShape ) + if( xDrawPage->getByIndex( nS ) >>= xShape ) { if( xShape.is() && xChartRoot!=xShape ) aShapeVector.push_back( xShape ); @@ -984,8 +983,8 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const if( !aShapeVector.empty() ) { // create a shape collection - xFoundShapes.set( drawing::ShapeCollection::create( - comphelper::getProcessComponentContext()), uno::UNO_QUERY ); + xFoundShapes = drawing::ShapeCollection::create( + comphelper::getProcessComponentContext()); OSL_ENSURE( xFoundShapes.is(), "Couldn't create a shape collection!" ); if( xFoundShapes.is()) @@ -1188,9 +1187,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xDia.is()) { // locked controllers - Reference< frame::XModel > xModel( xChartDoc, uno::UNO_QUERY ); - ControllerLockGuardUNO aCtrlLockGuard( xModel ); - Reference< chart2::XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel ); + ControllerLockGuardUNO aCtrlLockGuard( xChartDoc ); + Reference< chart2::XDiagram > xDiagram = ChartModelHelper::findDiagram( xChartDoc ); ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram ); Reference< lang::XMultiServiceFactory > xTemplateManager( xChartDoc->getChartTypeManager(), uno::UNO_QUERY ); DiagramHelper::tTemplateWithServiceName aTemplateWithService( @@ -1205,7 +1203,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( else { // locked controllers - ControllerLockGuardUNO aCtrlLockGuard( Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); + ControllerLockGuardUNO aCtrlLockGuard( xChartDoc ); xDia.set( xTemplate->createDiagramByDataSource( uno::Reference< chart2::data::XDataSource >(), uno::Sequence< beans::PropertyValue >())); diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 5702165bc763..813a51196def 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -543,7 +543,7 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties( //ReferenceSizePropertyProvider void DataSeriesPointWrapper::updateReferenceSize() { - Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) { if( xProp->getPropertyValue("ReferencePageSize").hasValue() ) @@ -554,7 +554,7 @@ void DataSeriesPointWrapper::updateReferenceSize() Any DataSeriesPointWrapper::getReferenceSize() { Any aRet; - Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) aRet = xProp->getPropertyValue("ReferencePageSize"); return aRet; diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 631c21744c99..038015c12257 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -342,7 +342,7 @@ void SAL_CALL LegendWrapper::removeEventListener( //ReferenceSizePropertyProvider void LegendWrapper::updateReferenceSize() { - Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) { if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() ) @@ -353,7 +353,7 @@ void LegendWrapper::updateReferenceSize() Any LegendWrapper::getReferenceSize() { Any aRet; - Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) aRet = xProp->getPropertyValue( "ReferencePageSize" ); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index f2086558180b..d46cc6c9ce01 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -277,7 +277,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); - Reference< beans::XPropertySet > xProp( getFirstCharacterPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xProp = getFirstCharacterPropertySet(); Reference< beans::XFastPropertySet > xFastProp( xProp, uno::UNO_QUERY ); if(xProp.is()) { @@ -404,7 +404,7 @@ void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rProperty sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) { - Reference< beans::XPropertySet > xPropSet( getFirstCharacterPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xPropSet = getFirstCharacterPropertySet(); if( xPropSet.is() ) xPropSet->addPropertyChangeListener( rPropertyName, xListener ); } @@ -416,7 +416,7 @@ void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPrope sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) { - Reference< beans::XPropertySet > xPropSet( getFirstCharacterPropertySet(), uno::UNO_QUERY ); + Reference< beans::XPropertySet > xPropSet = getFirstCharacterPropertySet(); if( xPropSet.is() ) xPropSet->removePropertyChangeListener( rPropertyName, xListener ); } diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index c34540f6a8e1..2b6a98c61d02 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -307,11 +307,9 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame uno::Reference< XChartTypeTemplate > xTemplate( getCurrentTemplate( rParameter, xTemplateManager ) ); if(xTemplate.is()) { - uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY); - // locked controllers - ControllerLockGuardUNO aCtrlLockGuard( xModel ); - uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel ); + ControllerLockGuardUNO aCtrlLockGuard( xChartModel ); + uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xChartModel ); DiagramHelper::tTemplateWithServiceName aTemplateWithService( DiagramHelper::getTemplateForDiagram( xDiagram, xTemplateManager )); if( aTemplateWithService.first.is()) @@ -1164,7 +1162,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar if (!m_xMF_NumberOfLines) return; - uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY ); + uno::Reference< frame::XModel > xModel = xChartModel; uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel ); if(!xDiagram.is()) diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 4748972d502b..272693f1d7c6 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -412,7 +412,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex ) } m_apDialogModel->startControllerLockTimer(); - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); xDataProvider->insertComplexCategoryLevel( nAfterColumnIndex+1 ); updateFromModel(); } @@ -427,7 +427,7 @@ void DataBrowserModel::removeComplexCategoryLevel( sal_Int32 nAtColumnIndex ) return; m_apDialogModel->startControllerLockTimer(); - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); xDataProvider->deleteComplexCategoryLevel( nAtColumnIndex ); updateFromModel(); @@ -658,7 +658,7 @@ bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const bResult = true; try { - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); // label if( nAtRow == -1 ) @@ -779,7 +779,7 @@ void DataBrowserModel::updateFromModel() sal_Int32 nHeaderStart = 0; sal_Int32 nHeaderEnd = 0; { - Reference< frame::XModel > xChartModel( m_xChartDocument, uno::UNO_QUERY ); + Reference< frame::XModel > xChartModel = m_xChartDocument; ChartModel* pModel = dynamic_cast(xChartModel.get()); if (!pModel) return; diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index a363c6cc6fc8..cdd1a187d766 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -373,7 +373,7 @@ DialogModel::DialogModel( const Reference< uno::XComponentContext > & xContext ) : m_xChartDocument( xChartDocument ), m_xContext( xContext ), - m_aTimerTriggeredControllerLock( uno::Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ) + m_aTimerTriggeredControllerLock( m_xChartDocument ) { } @@ -403,8 +403,7 @@ std::shared_ptr< RangeSelectionHelper > const & Reference< frame::XModel > DialogModel::getChartModel() const { - Reference< frame::XModel > xResult( m_xChartDocument, uno::UNO_QUERY ); - return xResult; + return m_xChartDocument; } Reference< data::XDataProvider > DialogModel::getDataProvider() const @@ -545,7 +544,7 @@ void DialogModel::moveSeries( MoveDirection eDirection ) { m_aTimerTriggeredControllerLock.startTimer(); - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); Reference< XDiagram > xDiagram( m_xChartDocument->getFirstDiagram()); DiagramHelper::moveSeries( xDiagram, xSeries, eDirection==MoveDirection::Up ); @@ -557,7 +556,7 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter( bool bCreateDataCachedSequences /* = false */ ) { m_aTimerTriggeredControllerLock.startTimer(); - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); Reference< XDataSeries > xNewSeries; try @@ -602,7 +601,7 @@ void DialogModel::deleteSeries( const Reference< XChartType > & xChartType ) { m_aTimerTriggeredControllerLock.startTimer(); - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); DataSeriesHelper::deleteSeries( xSeries, xChartType ); } @@ -703,7 +702,7 @@ void DialogModel::setData( const Sequence< beans::PropertyValue > & rArguments ) { m_aTimerTriggeredControllerLock.startTimer(); - ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aLockedControllers( m_xChartDocument ); Reference< data::XDataProvider > xDataProvider( getDataProvider()); if( ! xDataProvider.is() || diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 4aa16cd970dc..4edd9c4c2c13 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -57,7 +57,7 @@ OUString lcl_getDataSeriesName( const OUString& rObjectCID, const Reference< fra OUString aRet; Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); - Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); + Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ); if( xDiagram.is() && xSeries.is() ) { Reference< XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) ); @@ -462,7 +462,7 @@ OUString ObjectNameProvider::getGridName( const OUString& rObjectCID OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< chart2::XChartDocument >& xChartDocument ) { - return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ) ); + return getHelpText( rObjectCID, Reference< frame::XModel >( xChartDocument ) ); } OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Reference< frame::XModel >& xChartModel, bool bVerbose ) @@ -498,7 +498,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe aRet=SchResId(STR_TIP_DATAPOINT); Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); - Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); + Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ); if( xDiagram.is() && xSeries.is() ) { sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() ); @@ -719,14 +719,14 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID, { OUString aRet; ObjectType eObjectType( ObjectIdentifier::getObjectType(rObjectCID) ); - Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY ); + Reference< frame::XModel > xChartModel = xChartDocument; if( eObjectType == OBJECTTYPE_DATA_POINT ) { aRet = SchResId( STR_STATUS_DATAPOINT_MARKED ); Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); - Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ), uno::UNO_QUERY ); + Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel ); if( xDiagram.is() && xSeries.is() ) { sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() ); @@ -772,7 +772,7 @@ OUString ObjectNameProvider::getNameForCID( const uno::Reference< chart2::XChartDocument >& xChartDocument ) { ObjectType eType( ObjectIdentifier::getObjectType( rObjectCID )); - Reference< frame::XModel > xModel( xChartDocument, uno::UNO_QUERY ); + Reference< frame::XModel > xModel = xChartDocument; switch( eType ) { @@ -841,8 +841,8 @@ OUString ObjectNameProvider::getName_ObjectForSeries( const OUString& rSeriesCID, const uno::Reference< chart2::XChartDocument >& xChartDocument ) { - uno::Reference< frame::XModel> xChartModel( xChartDocument, uno::UNO_QUERY ); - Reference< XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rSeriesCID , xChartModel ), uno::UNO_QUERY ); + uno::Reference< frame::XModel> xChartModel = xChartDocument; + Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rSeriesCID , xChartModel ); if( xSeries.is() ) { OUString aRet = SchResId(STR_OBJECT_FOR_SERIES); diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index d06dcf894ee5..775f80535f32 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -99,7 +99,7 @@ bool RangeSelectionHelper::chooseRange( const OUString & aUIString, RangeSelectionListenerParent & rListenerParent ) { - ControllerLockGuardUNO aGuard( Reference< frame::XModel >(m_xChartDocument, uno::UNO_QUERY ) ); + ControllerLockGuardUNO aGuard( m_xChartDocument ); bool bResult = true; raiseRangeSelectionDocument(); @@ -127,7 +127,7 @@ bool RangeSelectionHelper::chooseRange( if( m_xRangeSelectionListener.is() ) stopRangeListening(); m_xRangeSelectionListener.set( Reference< sheet::XRangeSelectionListener >( - new RangeSelectionListener( rListenerParent, aCurrentRange, Reference< frame::XModel >(m_xChartDocument, uno::UNO_QUERY ) ))); + new RangeSelectionListener( rListenerParent, aCurrentRange, m_xChartDocument ))); xRangeSel->addRangeSelectionListener( m_xRangeSelectionListener ); xRangeSel->startRangeSelection( aArgs ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 602b2d6b2858..fd4710151511 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -613,7 +613,7 @@ ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference< , m_aChartTypeDialogControllerList(0) , m_pCurrentMainType(nullptr) , m_nChangingCalls(0) - , m_aTimerTriggeredControllerLock( uno::Reference< frame::XModel >( m_xChartModel, uno::UNO_QUERY ) ) + , m_aTimerTriggeredControllerLock( m_xChartModel ) , m_xFT_ChooseType(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD")) , m_xMainTypeList(m_xBuilder->weld_tree_view("charttype")) , m_xSubTypeList(new SvtValueSet(m_xBuilder->weld_scrolled_window("subtypewin"))) @@ -867,8 +867,7 @@ void ChartTypeTabPage::initializePage() if( !m_xChartModel.is() ) return; uno::Reference< lang::XMultiServiceFactory > xTemplateManager( m_xChartModel->getChartTypeManager(), uno::UNO_QUERY ); - uno::Reference< frame::XModel > xModel( m_xChartModel, uno::UNO_QUERY); - uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); + uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) ); DiagramHelper::tTemplateWithServiceName aTemplate = DiagramHelper::getTemplateForDiagram( xDiagram, xTemplateManager ); OUString aServiceName( aTemplate.second ); diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 5ed463ca3f76..047c434f87fc 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -116,8 +116,7 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const m_pDrawModelWrapper->getShapeFactory()); //get hidden draw page (target): - uno::Reference xTarget(m_pDrawModelWrapper->getHiddenDrawPage(), - uno::UNO_QUERY); + uno::Reference xTarget = m_pDrawModelWrapper->getHiddenDrawPage(); //create symbols via uno and convert to native sdr objects drawing::Direction3D aSymbolSize(220, 220, 0); // should be 250, but 250 -> 280 ?? diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 6473cd683d24..7a03d2c67992 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -371,13 +371,11 @@ uno::Reference getSidebarFromModel(const uno::Reference xSidebarProvider (xController->getSidebar(), uno::UNO_QUERY); + uno::Reference xSidebarProvider = xController->getSidebar(); if (!xSidebarProvider.is()) return nullptr; - uno::Reference xSidebar(xSidebarProvider->getSidebar(), uno::UNO_QUERY); - - return xSidebar; + return xSidebarProvider->getSidebar(); } } @@ -784,8 +782,7 @@ void SAL_CALL ChartController::dispose() if( xSelectionChangeListener.is() ) { uno::Reference< frame::XController > xController( this ); - uno::Reference< lang::XComponent > xComp( xController, uno::UNO_QUERY ); - lang::EventObject aEvent( xComp ); + lang::EventObject aEvent( xController ); xSelectionChangeListener->disposing( aEvent ); } } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 50a3a3904219..5789ebdd27c9 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -247,8 +247,8 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() m_xUndoManager ); //if a series is selected insert labels for that series only: - uno::Reference< chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel()), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel()); if( xSeries.is() ) { // add labels @@ -319,8 +319,8 @@ void ChartController::executeDispatch_InsertMenu_MeanValues() ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); - uno::Reference< chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); if( xSeries.is() ) { //if a series is selected insert mean value only for that series: @@ -341,8 +341,8 @@ void ChartController::executeDispatch_InsertMenu_Trendlines() { OUString aCID = m_aSelection.getSelectedCID(); - uno::Reference< chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ); if( !xSeries.is() ) return; @@ -413,8 +413,8 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError ) ObjectType objType = bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X; //if a series is selected insert error bars for that series only: - uno::Reference< chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); if( xSeries.is()) { @@ -543,8 +543,8 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) void ChartController::executeDispatch_InsertR2Value() { - uno::Reference< beans::XPropertySet > xEqProp( - ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xEqProp = + ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ); if( xEqProp.is()) { UndoGuard aUndoGuard( @@ -558,8 +558,8 @@ void ChartController::executeDispatch_InsertR2Value() void ChartController::executeDispatch_DeleteR2Value() { - uno::Reference< beans::XPropertySet > xEqProp( - ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xEqProp = + ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ); if( xEqProp.is()) { UndoGuard aUndoGuard( @@ -633,8 +633,8 @@ void ChartController::executeDispatch_DeleteErrorBars( bool bYError ) void ChartController::executeDispatch_InsertDataLabels() { - uno::Reference< chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); if( xSeries.is() ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, @@ -656,8 +656,8 @@ void ChartController::executeDispatch_InsertDataLabel() void ChartController::executeDispatch_DeleteDataLabels() { - uno::Reference< chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); if( xSeries.is() ) { UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete, @@ -682,7 +682,7 @@ void ChartController::executeDispatch_ResetAllDataPoints() UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Format, SchResId( STR_OBJECT_DATAPOINTS )), m_xUndoManager ); - uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); if( xSeries.is() ) xSeries->resetAllDataPoints(); aUndoGuard.commit(); @@ -692,7 +692,7 @@ void ChartController::executeDispatch_ResetDataPoint() UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Format, SchResId( STR_OBJECT_DATAPOINT )), m_xUndoManager ); - uno::Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); + uno::Reference< chart2::XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ); if( xSeries.is() ) { sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( m_aSelection.getSelectedCID() ); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index ef29211ce098..be7760caca62 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -444,7 +444,7 @@ OUString lcl_getObjectCIDForCommand( const OString& rDispatchCommand, const uno: { ObjectType eObjectType = OBJECTTYPE_UNKNOWN; - uno::Reference< frame::XModel > xChartModel( xChartDocument, uno::UNO_QUERY ); + uno::Reference< frame::XModel > xChartModel = xChartDocument; const ObjectType eSelectedType = ObjectIdentifier::getObjectType( rSelectedCID ); uno::Reference< XDataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rSelectedCID, xChartModel ); uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt( xSeries, uno::UNO_QUERY ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 963baf15d405..423165322252 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -348,7 +348,7 @@ void ChartController::impl_PasteGraphic( uno::Reference< beans::XPropertySet > xGraphicShapeProp( xGraphicShape, uno::UNO_QUERY ); if( xGraphicShapeProp.is() && xGraphicShape.is()) { - uno::Reference< drawing::XShapes > xPage( pDrawModelWrapper->getMainDrawPage(), uno::UNO_QUERY ); + uno::Reference< drawing::XShapes > xPage = pDrawModelWrapper->getMainDrawPage(); if( xPage.is()) { xPage->add( xGraphicShape ); diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 27a0fe3e5ec0..4b732ceae1ac 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -291,8 +291,8 @@ void ControllerState::update( bool bHasR2Value = false; try { - uno::Reference< beans::XPropertySet > xEquationProperties( - ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xEquationProperties = + ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ); if( xEquationProperties.is() ) xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value; } diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index fc4d71b40906..1a7e9a35c6b5 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -49,10 +49,7 @@ void StatusBarCommandDispatch::initialize() { if( m_xModifiable.is()) { - Reference< util::XModifyBroadcaster > xModifyBroadcaster( m_xModifiable, uno::UNO_QUERY ); - OSL_ASSERT( xModifyBroadcaster.is()); - if( xModifyBroadcaster.is()) - xModifyBroadcaster->addModifyListener( this ); + m_xModifiable->addModifyListener( this ); } if( m_xSelectionSupplier.is()) diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 9ea10136a9e0..20a848fe4792 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -125,8 +125,8 @@ void setLabelPosition(const css::uno::Reference& xModel, bool isReverse(const css::uno::Reference& xModel, const OUString& rCID) { - css::uno::Reference< css::chart2::XAxis > xAxis( - ObjectIdentifier::getAxisForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XAxis > xAxis = + ObjectIdentifier::getAxisForCID(rCID, xModel); if (!xAxis.is()) return false; @@ -139,8 +139,8 @@ bool isReverse(const css::uno::Reference& xModel, void setReverse(const css::uno::Reference& xModel, const OUString& rCID, bool bReverse) { - css::uno::Reference< css::chart2::XAxis > xAxis( - ObjectIdentifier::getAxisForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XAxis > xAxis = + ObjectIdentifier::getAxisForCID(rCID, xModel); if (!xAxis.is()) return; diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 3d4fc3ecc2dc..3eddfb58c2dd 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -45,8 +45,8 @@ namespace { bool isDataLabelVisible(const css::uno::Reference& xModel, const OUString& rCID) { - css::uno::Reference< css::chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID(rCID, xModel); if (!xSeries.is()) return false; @@ -56,8 +56,8 @@ bool isDataLabelVisible(const css::uno::Reference& xModel, c void setDataLabelVisible(const css::uno::Reference& xModel, const OUString& rCID, bool bVisible) { - css::uno::Reference< css::chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID(rCID, xModel); if (!xSeries.is()) return; @@ -166,8 +166,8 @@ void setTrendlineVisible(const css::uno::Reference& bool isErrorBarVisible(const css::uno::Reference& xModel, const OUString& rCID, bool bYError) { - css::uno::Reference< css::chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID(rCID, xModel); if (!xSeries.is()) return false; @@ -178,8 +178,8 @@ bool isErrorBarVisible(const css::uno::Reference& xModel, void setErrorBarVisible(const css::uno::Reference& xModel, const OUString& rCID, bool bYError, bool bVisible) { - css::uno::Reference< css::chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID(rCID, xModel); if (!xSeries.is()) return; @@ -199,8 +199,8 @@ void setErrorBarVisible(const css::uno::Reference& bool isPrimaryAxis(const css::uno::Reference& xModel, const OUString& rCID) { - css::uno::Reference< css::chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID(rCID, xModel); if (!xSeries.is()) return true; @@ -235,8 +235,8 @@ css::uno::Reference getChartType( OUString getSeriesLabel(const css::uno::Reference& xModel, const OUString& rCID) { - css::uno::Reference< css::chart2::XDataSeries > xSeries( - ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + css::uno::Reference< css::chart2::XDataSeries > xSeries = + ObjectIdentifier::getDataSeriesForCID(rCID, xModel); if (!xSeries.is()) return OUString(); diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index c2ec355441b7..ebca2a63bc86 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -414,9 +414,8 @@ ErrCode XMLFilter::impl_ImportStream( { ErrCode nWarning = ERRCODE_SFX_GENERAL; - Reference< container::XNameAccess > xNameAcc( xStorage, uno::UNO_QUERY ); - if( ! (xNameAcc.is() && - xNameAcc->hasByName( rStreamName ))) + if( ! (xStorage.is() && + xStorage->hasByName( rStreamName ))) return ERRCODE_NONE; if( xImportInfo.is() ) @@ -553,7 +552,7 @@ ErrCode XMLFilter::impl_Export( if( ! xStorage.is()) return ERRCODE_SFX_GENERAL; - uno::Reference< xml::sax::XDocumentHandler> xDocHandler( xSaxWriter, uno::UNO_QUERY ); + uno::Reference< xml::sax::XDocumentHandler> xDocHandler = xSaxWriter; if ( !m_sDocumentHandler.isEmpty() ) { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 2e3244c3031c..23af9372f44d 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -93,7 +93,7 @@ ChartModel::ChartModel(uno::Reference const & xContext) , m_aVisualAreaSize( ChartModelHelper::getDefaultPageSize() ) , m_xPageBackground( new PageBackground ) , m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType::get(), - "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) + "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ) ) , mnStart(0) , mnEnd(0) { 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(); diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 5d1ab0096ae1..3bcd72ff2904 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -2382,9 +2382,8 @@ uno::Reference< drawing::XShape > //set text and text properties uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY ); uno::Reference< text::XTextCursor > xTextCursor( xText->createTextCursor() ); - uno::Reference< text::XTextRange > xTextRange( xTextCursor, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xShapeProp( xShape, uno::UNO_QUERY ); - if( !xText.is() || !xTextRange.is() || !xTextCursor.is() || !xShapeProp.is() || !xTextProperties.is() ) + if( !xText.is() || !xTextCursor.is() || !xShapeProp.is() || !xTextProperties.is() ) return xShape; tPropertyNameValueMap aValueMap; @@ -2439,7 +2438,7 @@ uno::Reference< drawing::XShape > aLabel = ShapeFactory::getStackedString( aLabel, bStackCharacters ); xTextCursor->gotoEnd(false); - xText->insertString( xTextRange, aLabel, false ); + xText->insertString( xTextCursor, aLabel, false ); xTextCursor->gotoEnd(true); uno::Reference< beans::XPropertySet > xTargetProps( xShape, uno::UNO_QUERY ); uno::Reference< beans::XPropertySet > xSourceProps( xFormattedString[0], uno::UNO_QUERY ); @@ -2461,7 +2460,7 @@ uno::Reference< drawing::XShape > for( nN=0; nNgotoEnd(false); - xText->insertString( xTextRange, xFormattedString[nN]->getString(), false ); + xText->insertString( xTextCursor, xFormattedString[nN]->getString(), false ); xTextCursor->gotoEnd(true); } awt::Size aOldRefSize; -- cgit