diff options
Diffstat (limited to 'chart2/source/controller/dialogs')
6 files changed, 25 insertions, 29 deletions
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<ChartModel*>(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 ); |