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 /oox | |
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 'oox')
-rw-r--r-- | oox/source/docprop/ooxmldocpropimport.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/vbaproject.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 6 | ||||
-rw-r--r-- | oox/source/ppt/timenode.cxx | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 00f138f6d551..3b87c04c652c 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -72,7 +72,7 @@ Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxSto aStreamPath = aStreamPath.copy(1); Reference< XExtendedStorageStream > xExtStream( - xHierarchy->openStreamElementByHierarchicalName( aStreamPath, ElementModes::READ ), UNO_QUERY_THROW ); + xHierarchy->openStreamElementByHierarchicalName( aStreamPath, ElementModes::READ ), UNO_SET_THROW ); Reference< XInputStream > xInStream = xExtStream->getInputStream(); if( xInStream.is() ) { diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 26b037563495..b1591a2fb7f5 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -533,7 +533,7 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg ) if( mxContext.is() ) try { Reference< XStorageBasedDocument > xStorageBasedDoc( mxDocModel, UNO_QUERY_THROW ); - Reference< XStorage > xDocStorage( xStorageBasedDoc->getDocumentStorage(), UNO_QUERY_THROW ); + Reference< XStorage > xDocStorage( xStorageBasedDoc->getDocumentStorage(), UNO_SET_THROW ); { const sal_Int32 nOpenMode = ElementModes::SEEKABLE | ElementModes::WRITE | ElementModes::TRUNCATE; Reference< XStream > xDocStream( xDocStorage->openStreamElement( "_MS_VBA_Macros", nOpenMode ), UNO_SET_THROW ); diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 689e6e162cc5..e7cf6ffb0511 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -111,7 +111,7 @@ static void ResolveTextFields( XmlFilterBase const & rFilter ) { const OUString sURL = "URL"; Reference< drawing::XDrawPagesSupplier > xDPS( xModel, uno::UNO_QUERY_THROW ); - Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_QUERY_THROW ); + Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_SET_THROW ); const oox::core::TextField& rTextField( textField ); Reference< XPropertySet > xPropSet( rTextField.xTextField, UNO_QUERY ); @@ -234,7 +234,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage // importing slide pages and its corresponding notes page Reference< drawing::XDrawPagesSupplier > xDPS( xModel, uno::UNO_QUERY_THROW ); - Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_QUERY_THROW ); + Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_SET_THROW ); try { @@ -277,7 +277,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32 nSlide, bool bFirstPage { // masterpersist not found, we have to load it Reference< drawing::XDrawPage > xMasterPage; Reference< drawing::XMasterPagesSupplier > xMPS( xModel, uno::UNO_QUERY_THROW ); - Reference< drawing::XDrawPages > xMasterPages( xMPS->getMasterPages(), uno::UNO_QUERY_THROW ); + Reference< drawing::XDrawPages > xMasterPages( xMPS->getMasterPages(), uno::UNO_SET_THROW ); if( rFilter.getMasterPages().empty() ) xMasterPages->getByIndex( 0 ) >>= xMasterPage; diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 198d0391f3eb..b3391ddd6005 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -114,7 +114,7 @@ namespace oox { namespace ppt { { bool bFirst = true; Reference< XEnumerationAccess > xEA( xNode, UNO_QUERY_THROW ); - Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_QUERY_THROW ); + Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_SET_THROW ); while( xE->hasMoreElements() ) { // click node @@ -129,7 +129,7 @@ namespace oox { namespace ppt { { bFirst = false; Reference< XEnumerationAccess > xEA2( xClickNode, UNO_QUERY_THROW ); - Reference< XEnumeration > xE2( xEA2->createEnumeration(), UNO_QUERY_THROW ); + Reference< XEnumeration > xE2( xEA2->createEnumeration(), UNO_SET_THROW ); if( xE2->hasMoreElements() ) { // with node @@ -181,7 +181,7 @@ namespace oox { namespace ppt { xNode->setBegin( aEmpty ); Reference< XEnumerationAccess > xEA( xNode, UNO_QUERY_THROW ); - Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_QUERY_THROW ); + Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_SET_THROW ); while( xE->hasMoreElements() ) { // click node |