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 /basctl | |
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 'basctl')
-rw-r--r-- | basctl/source/basicide/scriptdocument.cxx | 18 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 2cf0a44dcaf5..5e2c32eed5ca 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -482,11 +482,11 @@ namespace basctl Reference< XNameContainer > xLibrary; try { - Reference< XLibraryContainer > xLibContainer( getLibraryContainer( _eType ), UNO_QUERY_THROW ); + Reference< XLibraryContainer > xLibContainer( getLibraryContainer( _eType ), UNO_SET_THROW ); if ( xLibContainer->hasByName( _rLibName ) ) xLibrary.set( xLibContainer->getByName( _rLibName ), UNO_QUERY_THROW ); else - xLibrary.set( xLibContainer->createLibrary( _rLibName ), UNO_QUERY_THROW ); + xLibrary.set( xLibContainer->createLibrary( _rLibName ), UNO_SET_THROW ); if ( !xLibContainer->isLibraryLoaded( _rLibName ) ) xLibContainer->loadLibrary( _rLibName ); @@ -569,7 +569,7 @@ namespace basctl _out_rModuleOrDialog.clear(); try { - Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_QUERY_THROW ); + Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_SET_THROW ); if ( xLib->hasByName( _rObjectName ) ) { _out_rModuleOrDialog = xLib->getByName( _rObjectName ); @@ -593,7 +593,7 @@ namespace basctl try { - Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_QUERY_THROW ); + Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_SET_THROW ); // get element Any aElement( xLib->getByName( _rOldName ) ); @@ -622,7 +622,7 @@ namespace basctl Reference< XInputStreamProvider > xISP( aElement, UNO_QUERY_THROW ); if ( !_rxExistingDialogModel.is() ) { - Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW ); + Reference< XInputStream > xInput( xISP->createInputStream(), UNO_SET_THROW ); ::xmlscript::importDialogModel( xInput, xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() ); } @@ -696,7 +696,7 @@ namespace basctl { try { - Reference< XNameContainer > xLib( getOrCreateLibrary( _eType, _rLibName ), UNO_QUERY_THROW ); + Reference< XNameContainer > xLib( getOrCreateLibrary( _eType, _rLibName ), UNO_SET_THROW ); if ( xLib->hasByName( _rObjectName ) ) return false; @@ -715,7 +715,7 @@ namespace basctl { try { - Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_QUERY_THROW ); + Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_SET_THROW ); if ( !xLib->hasByName( _rModName ) ) return false; xLib->replaceByName( _rModName, Any( _rModuleCode ) ); @@ -733,7 +733,7 @@ namespace basctl { try { - Reference< XNameContainer > xLib( getLibrary( E_DIALOGS, _rLibName, true ), UNO_QUERY_THROW ); + Reference< XNameContainer > xLib( getLibrary( E_DIALOGS, _rLibName, true ), UNO_SET_THROW ); // create dialog _out_rDialogProvider.clear(); @@ -927,7 +927,7 @@ namespace basctl Reference< XUriReferenceFactory > xUriFac = UriReferenceFactory::create(xContext); OUString aLinkURL( xLibContainer->getLibraryLinkURL( _rLibName ) ); - Reference< XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_QUERY_THROW ); + Reference< XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_SET_THROW ); OUString aScheme = xUriRef->getScheme(); if ( aScheme.equalsIgnoreAsciiCase("file") ) diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index ae4eacb5e821..87983eeaf821 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -133,7 +133,7 @@ void PropBrw::ImplReCreateController() ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) ); // create a property browser controller - Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_QUERY_THROW ); + Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_SET_THROW ); static const char s_sControllerServiceName[] = "com.sun.star.awt.PropertyBrowserController"; m_xBrowserController.set( xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY ); if ( !m_xBrowserController.is() ) |