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 /forms/source | |
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 'forms/source')
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/cachedrowset.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/propertybaghelper.cxx | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 378ee9dc04c9..a92913889217 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -303,7 +303,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource ) Reference< XPropertySetInfo > xSourcePSI( xSourceProps->getPropertySetInfo(), UNO_SET_THROW ); Reference< XPropertyState > xSourcePropState( xSourceProps, UNO_QUERY ); - Reference< XPropertySetInfo > xDestPSI( getPropertySetInfo(), UNO_QUERY_THROW ); + Reference< XPropertySetInfo > xDestPSI( getPropertySetInfo(), UNO_SET_THROW ); Sequence< Property > aSourceProperties( xSourcePSI->getProperties() ); for ( auto const & sourceProperty : aSourceProperties ) diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx index 0f26c801a977..2ff4802967ce 100644 --- a/forms/source/component/cachedrowset.cxx +++ b/forms/source/component/cachedrowset.cxx @@ -91,7 +91,7 @@ namespace frm void CachedRowSet::setCommandFromQuery( const OUString& _rQueryName ) { Reference< XQueriesSupplier > xSupplyQueries( m_pData->xConnection, UNO_QUERY_THROW ); - Reference< XNameAccess > xQueries ( xSupplyQueries->getQueries(), UNO_QUERY_THROW ); + Reference< XNameAccess > xQueries ( xSupplyQueries->getQueries(), UNO_SET_THROW ); Reference< XPropertySet > xQuery ( xQueries->getByName( _rQueryName ), UNO_QUERY_THROW ); bool bEscapeProcessing( false ); diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index f88c68abc35d..6ffe38ac0786 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -207,8 +207,8 @@ namespace frm impl_nts_checkDisposed_throw(); // check whether it's removable at all - Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), UNO_QUERY_THROW ); - Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(), UNO_QUERY_THROW ); + Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), css::uno::UNO_SET_THROW ); + Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(), css::uno::UNO_SET_THROW ); Property aProperty( xPSI->getPropertyByName( _rName ) ); if ( ( aProperty.Attributes & PropertyAttribute::REMOVABLE ) == 0 ) throw NotRemoveableException( _rName, xMe ); @@ -254,8 +254,8 @@ namespace frm ::osl::MutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); - Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), UNO_QUERY_THROW ); - Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(), UNO_QUERY_THROW ); + Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), css::uno::UNO_SET_THROW ); + Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(), css::uno::UNO_SET_THROW ); Sequence< Property > aProperties( xPSI->getProperties() ); Sequence< OUString > aPropertyNames( aProperties.getLength() ); @@ -326,7 +326,7 @@ namespace frm ::std::transform( aSortedProps.getConstArray(), aSortedProps.getConstArray() + nPropertyValues, aValues.getArray(), SelectValueOfPropertyValue() ); - Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), UNO_QUERY_THROW ); + Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), css::uno::UNO_SET_THROW ); aGuard.clear(); xMe->setPropertyValues( aNames, aValues ); |