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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/qa/cppunit/Dialog.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/gridcontrol.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/qa/cppunit/Dialog.cxx b/toolkit/qa/cppunit/Dialog.cxx index 489d686feec9..9e832a8c9175 100644 --- a/toolkit/qa/cppunit/Dialog.cxx +++ b/toolkit/qa/cppunit/Dialog.cxx @@ -49,7 +49,7 @@ CPPUNIT_TEST_FIXTURE(DialogTest, testDialogSizeable) { uno::Reference<awt::XDialog> xDialog; uno::Reference<lang::XMultiComponentFactory> xFactory(mxContext->getServiceManager(), - uno::UNO_QUERY_THROW); + uno::UNO_SET_THROW); uno::Reference<awt::XControlModel> xControlModel( xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", mxContext), uno::UNO_QUERY_THROW); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 6a483bacdd17..8c1c69d2f792 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2143,7 +2143,7 @@ void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) pListBox->Clear(); uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_SET_THROW ); uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; if ( xPSI->hasPropertyByName("ResourceResolver") ) { @@ -4602,7 +4602,7 @@ void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) pComboBox->Clear(); uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_SET_THROW ); // bool localize = xPSI->hasPropertyByName("ResourceResolver"); uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; if ( xPSI->hasPropertyByName("ResourceResolver") ) diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 6cd6e8ad151b..2602d112a017 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -57,7 +57,7 @@ namespace { Reference< XGridDataModel > lcl_getDefaultDataModel_throw( const Reference<XComponentContext> & i_context ) { - Reference< XMutableGridDataModel > const xDelegatorModel( DefaultGridDataModel::create( i_context ), UNO_QUERY_THROW ); + Reference< XMutableGridDataModel > const xDelegatorModel( DefaultGridDataModel::create( i_context ), UNO_SET_THROW ); Reference< XGridDataModel > const xDataModel( SortableGridDataModel::create( i_context, xDelegatorModel ), UNO_QUERY_THROW ); return xDataModel; } |