diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-10 10:13:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-13 08:15:27 +0200 |
commit | a361231b1363d072d737e9b1d411b71aa9550d84 (patch) | |
tree | 08641fe2af10c1f22c7fd58e62f99b6dbe301c62 /sdext/source/minimizer | |
parent | ce76026231d9536d2025a1e69f435bcbf39fe4f8 (diff) |
fix wrong SET/QUERY flags passed to uno::Reference
By creating deleted methods for the wrong calls.
Avoids the compiler needing to construct a temporary
Change-Id: I3b8c648d6bb22d22827bf74f21ea5a2a17fc0f6a
Reviewed-on: https://gerrit.libreoffice.org/72103
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext/source/minimizer')
-rw-r--r-- | sdext/source/minimizer/graphiccollector.cxx | 8 | ||||
-rw-r--r-- | sdext/source/minimizer/impoptimizer.cxx | 10 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizationstats.cxx | 2 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 2 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizerdialogcontrols.cxx | 8 | ||||
-rw-r--r-- | sdext/source/minimizer/pagecollector.cxx | 8 | ||||
-rw-r--r-- | sdext/source/minimizer/unodialog.cxx | 6 |
7 files changed, 22 insertions, 22 deletions
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 73cd5195e51e..195dc244da4c 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -265,7 +265,7 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx { sal_Int32 i; Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -278,7 +278,7 @@ void GraphicCollector::CollectGraphics( const Reference< XComponentContext >& rx ImpCollectGraphicObjects( rxMSF, xNotesPage, rGraphicSettings, rGraphicList ); } Reference< XMasterPagesSupplier > xMasterPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_SET_THROW ); for ( i = 0; i < xMasterPages->getCount(); i++ ) { Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -394,7 +394,7 @@ void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxMS { sal_Int32 i; Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -407,7 +407,7 @@ void GraphicCollector::CountGraphics( const Reference< XComponentContext >& rxMS ImpCountGraphicObjects( rxMSF, xNotesPage, rGraphicSettings, rnGraphics ); } Reference< XMasterPagesSupplier > xMasterPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_SET_THROW ); for ( i = 0; i < xMasterPages->getCount(); i++ ) { Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ), UNO_QUERY_THROW ); diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index b8d8d5c3a33e..3c7e0561c960 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -80,7 +80,7 @@ static void ImpExtractCustomShow( const Reference< XModel >& rxModel, const OUSt { PageCollector::CollectNonCustomShowPages( rxModel, rCustomShowName, vNonUsedPageList ); Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for( const auto& rxPage : vNonUsedPageList ) xDrawPages->remove( rxPage ); } @@ -97,7 +97,7 @@ static void ImpDeleteUnusedMasterPages( const Reference< XModel >& rxModel ) // now master pages that are not marked can be deleted Reference< XMasterPagesSupplier > xMasterPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_SET_THROW ); for( const auto& rMasterPage : aMasterPageList ) { if ( !rMasterPage.bUsed ) @@ -110,7 +110,7 @@ static void ImpDeleteHiddenSlides( const Reference< XModel >& rxModel ) try { Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -137,7 +137,7 @@ static void ImpDeleteNotesPages( const Reference< XModel >& rxModel ) try { Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); sal_Int32 i, nPages = xDrawPages->getCount(); for( i = 0; i < nPages; i++ ) { @@ -160,7 +160,7 @@ static void ImpConvertOLE( const Reference< XModel >& rxModel, sal_Int32 nOLEOpt try { Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index 93d86ed9cb1c..f1f817338961 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.cxx @@ -75,7 +75,7 @@ void OptimizationStats::InitializeStatusValuesFromDocument( const Reference< XMo try { Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); SetStatusValue( TK_Pages, Any( awt::Size( 0, xDrawPages->getCount() ) ) ); } catch ( Exception& ) diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 61b877e7fa72..9df50284a29b 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -138,7 +138,7 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const OUString& { Reference< XSingleServiceFactory > xSFRoadmap( mxRoadmapControlModel, UNO_QUERY_THROW ); Reference< XIndexContainer > aIndexContainerRoadmap( mxRoadmapControlModel, UNO_QUERY_THROW ); - Reference< XInterface > xRoadmapItem( xSFRoadmap->createInstance(), UNO_QUERY_THROW ); + Reference< XInterface > xRoadmapItem( xSFRoadmap->createInstance(), UNO_SET_THROW ); Reference< XPropertySet > xPropertySet( xRoadmapItem, UNO_QUERY_THROW ); xPropertySet->setPropertyValue( "Label", Any( rLabel ) ); xPropertySet->setPropertyValue( "Enabled", Any( true ) ); diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index f36185f2e515..b8d4bab949cc 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -548,7 +548,7 @@ void OptimizerDialog::InitPage3() int nOLECount = 0; Reference< XModel > xModel( mxController->getModel() ); Reference< XDrawPagesSupplier > xDrawPagesSupplier( xModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -686,7 +686,7 @@ void OptimizerDialog::UpdateControlStatesPage4() else { Reference< XDrawPagesSupplier > xDrawPagesSupplier( mxController->getModel(), UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -707,7 +707,7 @@ void OptimizerDialog::UpdateControlStatesPage4() std::vector< PageCollector::MasterPageEntity > aMasterPageList; PageCollector::CollectMasterPages( mxController->getModel(), aMasterPageList ); Reference< XMasterPagesSupplier > xMasterPagesSupplier( mxController->getModel(), UNO_QUERY_THROW ); - Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_SET_THROW ); nDeletedSlides += std::count_if(aMasterPageList.begin(), aMasterPageList.end(), [](const PageCollector::MasterPageEntity& rEntity) { return !rEntity.bUsed; }); } @@ -754,7 +754,7 @@ void OptimizerDialog::UpdateControlStatesPage4() { sal_Int32 nOLEReplacements = 0; Reference< XDrawPagesSupplier > xDrawPagesSupplier( mxController->getModel(), UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ ) { Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW ); diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index dcb630881761..7bed0b56ec24 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.cxx @@ -77,7 +77,7 @@ void PageCollector::CollectNonCustomShowPages( const css::uno::Reference< css::f if ( !vUsedPageList.empty() ) { Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( sal_Int32 j = 0; j < xDrawPages->getCount(); j++ ) { Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( j ), UNO_QUERY_THROW ); @@ -99,7 +99,7 @@ void PageCollector::CollectMasterPages( const Reference< XModel >& rxModel, std: { // generating list of all master pages Reference< XMasterPagesSupplier > xMasterPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_SET_THROW ); for ( sal_Int32 i = 0; i < xMasterPages->getCount(); i++ ) { Reference< XDrawPage > xMasterPage( xMasterPages->getByIndex( i ), UNO_QUERY_THROW ); @@ -116,11 +116,11 @@ void PageCollector::CollectMasterPages( const Reference< XModel >& rxModel, std: // mark masterpages which are referenced by drawpages Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); - Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); + Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW ); for ( sal_Int32 j = 0; j < xDrawPages->getCount(); j++ ) { Reference< XMasterPageTarget > xMasterPageTarget( xDrawPages->getByIndex( j ), UNO_QUERY_THROW ); - Reference< XDrawPage > xMasterPage( xMasterPageTarget->getMasterPage(), UNO_QUERY_THROW ); + Reference< XDrawPage > xMasterPage( xMasterPageTarget->getMasterPage(), UNO_SET_THROW ); auto aIter = std::find_if(rMasterPageList.begin(), rMasterPageList.end(), [&xMasterPage](const MasterPageEntity& rEntity) { return rEntity.xMasterPage == xMasterPage; }); if ( aIter == rMasterPageList.end() ) diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 8dc025ba9c37..a99240926614 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -42,7 +42,7 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference mxContext( rxContext ), mxController( rxFrame->getController() ), mxDialogModel( mxContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.awt.UnoControlDialogModel", mxContext ), UNO_QUERY_THROW ), + "com.sun.star.awt.UnoControlDialogModel", mxContext ), UNO_SET_THROW ), mxDialogModelMultiPropertySet( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelMSF( mxDialogModel, UNO_QUERY_THROW ), mxDialogModelNameContainer( mxDialogModel, UNO_QUERY_THROW ), @@ -194,7 +194,7 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlFormattedFieldModel", rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_SET_THROW ); } catch ( Exception& ) { @@ -262,7 +262,7 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque Reference< XPropertySet > xPropertySet( insertControlModel( "com.sun.star.awt.UnoControlImageControlModel", rName, rPropertyNames, rPropertyValues ), UNO_QUERY_THROW ); xPropertySet->setPropertyValue("Name", Any( rName ) ); - xControl.set( mxDialog->getControl( rName ), UNO_QUERY_THROW ); + xControl.set( mxDialog->getControl( rName ), UNO_SET_THROW ); } catch ( Exception& ) { |