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>

32 files changed, 68 insertions, 68 deletions

diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index c55392c4db98..7ad1ddabfb72 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -57,7 +57,7 @@ namespace dbaccess
         OUString sColumName;
         for (auto const& column : _rColumns->get())
         {
-            Reference< XPropertySet > xColumn(column, UNO_QUERY_THROW);
+            Reference< XPropertySet > xColumn(column, UNO_SET_THROW);
             xColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumName;
             aNames.push_back( sColumName );
         }
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 3c9b62b5d0ab..80771e48b76f 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1250,7 +1250,7 @@ bool OKeySet::fetchRow()
         ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size() + m_pForeignColumnNames->size());
 
         ::comphelper::disposeComponent(m_xSet);
-        m_xRow.set(m_xDriverRow, UNO_QUERY_THROW);
+        m_xRow.set(m_xDriverRow, UNO_SET_THROW);
 
         connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->get().begin();
         // copy key columns
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 397e9246f8fe..890260121dde 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1718,7 +1718,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
     bool bHaveAnyColumnSetting = false;
     try
     {
-        Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_QUERY_THROW );
+        Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_SET_THROW );
 
         // a number of properties is plain copied
         const OUString aPropertyNames[] = {
@@ -1759,7 +1759,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
     // can use as new template column
     try
     {
-        Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_QUERY_THROW );
+        Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_SET_THROW );
         if ( !xInfo->hasPropertyByName( PROPERTY_TABLENAME ) )
             // no chance
             return;
@@ -1767,13 +1767,13 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
         OUString sTableName;
         OSL_VERIFY( _rxTemplateColumn->getPropertyValue( PROPERTY_TABLENAME ) >>= sTableName );
 
-        Reference< XNameAccess > xTables( impl_getTables_throw(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xTables( impl_getTables_throw(), UNO_SET_THROW );
         if ( !xTables->hasByName( sTableName ) )
             // no chance
             return;
 
         Reference< XColumnsSupplier > xTableColSup( xTables->getByName( sTableName ), UNO_QUERY_THROW );
-        Reference< XNameAccess > xTableCols( xTableColSup->getColumns(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xTableCols( xTableColSup->getColumns(), UNO_SET_THROW );
 
         OUString sTableColumnName;
 
@@ -1903,7 +1903,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
         else
         {
             // create the rowset columns
-            Reference< XResultSetMetaData > xMeta( getMetaData(), UNO_QUERY_THROW );
+            Reference< XResultSetMetaData > xMeta( getMetaData(), UNO_SET_THROW );
             sal_Int32 nCount = xMeta->getColumnCount();
             m_aDataColumns.reserve(nCount+1);
             aColumns->get().reserve(nCount+1);
@@ -2224,7 +2224,7 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw()
     Reference< XTablesSupplier >  xTablesAccess( m_xActiveConnection, UNO_QUERY );
     if ( xTablesAccess.is() )
     {
-        xTables.set( xTablesAccess->getTables(), UNO_QUERY_THROW );
+        xTables.set( xTablesAccess->getTables(), UNO_SET_THROW );
     }
     else if ( m_xTables )
     {
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index a2b8c1a99658..c5cd28e606e4 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -785,7 +785,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
         {
             xPreparedStatement.set( m_xConnection->prepareStatement( sSQL ), UNO_QUERY_THROW );
             xResMetaDataSup.set( xPreparedStatement, UNO_QUERY_THROW );
-            xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
+            xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW );
         }
         catch( const Exception& ) { }
 
@@ -801,19 +801,19 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  )
                 for(sal_Int32 i = 1;i <= xPara->getCount();++i)
                     xParameters->setNull(i,DataType::VARCHAR);
                 xResMetaDataSup.set(xPreparedStatement->executeQuery(), UNO_QUERY_THROW );
-                xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
+                xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW );
             }
             catch( const Exception& ) { }
         }
 
         if ( !xResultSetMeta.is() )
         {
-            xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_QUERY_THROW ) );
+            xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_SET_THROW ) );
             Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW );
             try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( false ) ); }
             catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); }
             xResMetaDataSup.set( xStatement->executeQuery( sSQL ), UNO_QUERY_THROW );
-            xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
+            xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW );
 
             if (xResultSetMeta.is())
             {
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index cce34d3227db..af31bcfde41b 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -241,12 +241,12 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
 
         // retrieve the table in question
         Reference< XTablesSupplier > xSuppTables( _rxConnection, UNO_QUERY_THROW );
-        Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_SET_THROW );
         if ( !xTables->hasByName( sComposedTableName ) )
             return nullptr;
 
         Reference< XColumnsSupplier > xSuppCols( xTables->getByName( sComposedTableName ), UNO_QUERY_THROW );
-        Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_SET_THROW );
 
         OUString sColumn;
         OSL_VERIFY( getPropertyValue( PROPERTY_REALNAME ) >>= sColumn );
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index c690ca756a3b..f9137575a78d 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -142,7 +142,7 @@ void OQuery::rebuildColumns()
         {
             xComposer->setQuery( m_sCommand );
             Reference< XColumnsSupplier > xCols( xComposer, UNO_QUERY_THROW );
-            xColumns.set( xCols->getColumns(), UNO_QUERY_THROW );
+            xColumns.set( xCols->getColumns(), UNO_SET_THROW );
             xColumnsIndexed.set( xColumns, UNO_QUERY_THROW );
         }
         catch( const SQLException& ) { }
@@ -159,7 +159,7 @@ void OQuery::rebuildColumns()
                 ::dbtools::throwSQLException( sError, StandardSQLState::GENERAL_ERROR, *this );
             }
 
-            Reference< XDatabaseMetaData > xDBMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
+            Reference< XDatabaseMetaData > xDBMeta( m_xConnection->getMetaData(), UNO_SET_THROW );
             ::rtl::Reference< OSQLColumns > aParseColumns(
                 ::connectivity::parse::OParseColumn::createColumnsForResultSet( xResultSetMeta, xDBMeta,xColumnDefinitions ) );
             xColumns = OPrivateColumns::createWithIntrinsicNames(
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 3787dc8cf6aa..034c19dd7f5e 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1071,7 +1071,7 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain
 
         rxContainer.set(
             (*Factory)( m_aContext, xDocument ),
-            UNO_QUERY_THROW
+            UNO_SET_THROW
         );
     }
     catch( const RuntimeException& )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index b84ddfdf2fd9..24db02fc6be0 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1066,7 +1066,7 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph
         }
 
         // store to current storage
-        Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_QUERY_THROW );
+        Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW );
         Sequence< PropertyValue > aMediaDescriptor( lcl_appendFileNameToDescriptor( _rArguments, _rURL ) );
         impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard );
 
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index dc8a786f75cd..c3b6214e7bc8 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -911,7 +911,7 @@ namespace
         try
         {
             // obtain all properties currently known at the bag
-            Reference< XPropertySetInfo > xPSI( _rxPropertyBag->getPropertySetInfo(), UNO_QUERY_THROW );
+            Reference< XPropertySetInfo > xPSI( _rxPropertyBag->getPropertySetInfo(), UNO_SET_THROW );
             Sequence< Property > aAllExistentProperties( xPSI->getProperties() );
 
             Reference< XPropertyState > xPropertyState( _rxPropertyBag, UNO_QUERY_THROW );
@@ -1017,7 +1017,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
                 {
                     // collect the property attributes of all current settings
                     Reference< XPropertySet > xSettingsAsProps( m_pImpl->m_xSettings, UNO_QUERY_THROW );
-                    Reference< XPropertySetInfo > xPST( xSettingsAsProps->getPropertySetInfo(), UNO_QUERY_THROW );
+                    Reference< XPropertySetInfo > xPST( xSettingsAsProps->getPropertySetInfo(), UNO_SET_THROW );
                     Sequence< Property > aSettings( xPST->getProperties() );
                     std::map< OUString, sal_Int32 > aPropertyAttributes;
                     for ( auto const & setting : aSettings )
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d367b058af44..abe4570fd719 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -563,7 +563,7 @@ namespace
 void ODocumentDefinition::impl_removeFrameFromDesktop_throw( const Reference<XComponentContext> & _rxContext, const Reference< XFrame >& _rxFrame )
 {
     Reference< XDesktop2 > xDesktop = Desktop::create( _rxContext );
-    Reference< XFrames > xFrames( xDesktop->getFrames(), UNO_QUERY_THROW );
+    Reference< XFrames > xFrames( xDesktop->getFrames(), UNO_SET_THROW );
     xFrames->remove( _rxFrame );
 }
 
@@ -696,7 +696,7 @@ void ODocumentDefinition::impl_initFormEditView( const Reference< XController >&
     try
     {
         Reference< XViewSettingsSupplier > xSettingsSupplier( _rxController, UNO_QUERY_THROW );
-        Reference< XPropertySet > xViewSettings( xSettingsSupplier->getViewSettings(), UNO_QUERY_THROW );
+        Reference< XPropertySet > xViewSettings( xSettingsSupplier->getViewSettings(), UNO_SET_THROW );
 
         // the below code could indirectly tamper with the "modified" flag of the model, temporarily disable this
         LockModifiable aLockModify( _rxController->getModel() );
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 0881fd3a01a0..e899f1a16935 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -209,7 +209,7 @@ void OContainerMediator::notifyElementCreated( const OUString& _sName, const Ref
         impl_initSettings_nothrow( _sName, _xDest );
 
         // collect the to-be-monitored properties
-        Reference< XPropertySetInfo > xPSI( _xDest->getPropertySetInfo(), UNO_QUERY_THROW );
+        Reference< XPropertySetInfo > xPSI( _xDest->getPropertySetInfo(), UNO_SET_THROW );
         Sequence< Property > aProperties( xPSI->getProperties() );
         for ( auto const & property : aProperties )
         {
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index 930dfca632f8..f1a51b1e3fa2 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -66,7 +66,7 @@ namespace dbaccess
             throw DisposedException();
 
         Reference< XConnectionTools > xConnectionTools( xConnection, UNO_QUERY_THROW );
-        Reference< XObjectNames > xObjectNames( xConnectionTools->getObjectNames(), UNO_QUERY_THROW );
+        Reference< XObjectNames > xObjectNames( xConnectionTools->getObjectNames(), css::uno::UNO_SET_THROW );
         xObjectNames->checkNameForCreate( m_pImpl->nCommandType, _rName );
     }
 
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 55ef8b4e5466..be0e50586da9 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -298,7 +298,7 @@ namespace dbaccess
 
             // the storage for all components of the current type
             Reference< XStorage > xComponentsStor( xRecoveryStorage->openStorageElement(
-                SubComponentRecovery::getComponentsStorageName( eComponentType ), ElementModes::READ ), UNO_QUERY_THROW );
+                SubComponentRecovery::getComponentsStorageName( eComponentType ), ElementModes::READ ), UNO_SET_THROW );
 
             // loop through all components of this type
             for (auto const&  elem : elemMapCompDescs.second)
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index 75ceb4042ac5..2831f406bbf7 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -42,7 +42,7 @@ namespace dbaccess
         ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
 
         const Reference< XStream > xStream(
-            i_rParentStorage->openStreamElement( i_rStreamName, ElementModes::READWRITE ), UNO_QUERY_THROW );
+            i_rParentStorage->openStreamElement( i_rStreamName, ElementModes::READWRITE ), UNO_SET_THROW );
         m_xOutputStream.set( xStream->getOutputStream(), UNO_SET_THROW );
     }
 
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 7e6d9477830d..c04eff6f8912 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -125,7 +125,7 @@ namespace dbaccess
         ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
 
         const Reference< css::io::XStream > xStream(
-            i_rParentStorage->openStreamElement( i_rStreamName, css::embed::ElementModes::READ ), UNO_QUERY_THROW );
+            i_rParentStorage->openStreamElement( i_rStreamName, css::embed::ElementModes::READ ), css::uno::UNO_SET_THROW );
         m_xInputStream.set( xStream->getInputStream(), css::uno::UNO_SET_THROW );
 
         m_xParser.set( Parser::create(i_rContext) );
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 19b6e426fd31..e4ccd72fd7c4 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -370,13 +370,13 @@ namespace dbaccess
         // open the sub storage for the given kind of components
         const OUString& rStorageName( getComponentsStorageName( m_eType ) );
         const Reference< XStorage > xComponentsStorage( i_rRecoveryStorage->openStorageElement(
-            rStorageName, ElementModes::READWRITE ), UNO_QUERY_THROW );
+            rStorageName, ElementModes::READWRITE ), UNO_SET_THROW );
 
         // find a free sub storage name, and create Yet Another Sub Storage
         const OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) );
         const OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName );
         const Reference< XStorage > xObjectStor( xComponentsStorage->openStorageElement(
-            sStorName, ElementModes::READWRITE ), UNO_QUERY_THROW );
+            sStorName, ElementModes::READWRITE ), UNO_SET_THROW );
 
         switch ( m_eType )
         {
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 7ff4d349e935..7a662e9b6b74 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -350,7 +350,7 @@ namespace dbmm
             try
             {
                 Reference< XStorageBasedDocument > xStorageDoc( _rxDocument, UNO_QUERY_THROW );
-                Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_QUERY_THROW );
+                Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_SET_THROW );
                 bSuccess = lcl_commitStorage_nothrow( xDocStorage );
             }
             catch( const Exception& )
@@ -614,7 +614,7 @@ namespace dbmm
         try
         {
             Reference< XStorageBasedDocument > xStorageDoc( _rxDocument, UNO_QUERY_THROW );
-            Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_QUERY_THROW );
+            Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_SET_THROW );
 
             // the "Scripts" storage exist, or if it does not (yet) exist and we are in write mode
             // => open the storage
@@ -692,7 +692,7 @@ namespace dbmm
         try
         {
             Reference< XStorageBasedDocument > xStorageDoc( _rxDocument, UNO_QUERY_THROW );
-            Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_QUERY_THROW );
+            Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_SET_THROW );
             xDocStorage->removeElement( sScriptsStorageName );
         }
         catch( const Exception& )
@@ -1356,7 +1356,7 @@ namespace dbmm
 
             Reference< XStorageBasedLibraryContainer > xSourceLibraries(
                 _eScriptType == eBasic ? xSubDocScripts->getBasicLibraries() : xSubDocScripts->getDialogLibraries(),
-                UNO_QUERY_THROW
+                UNO_SET_THROW
             );
             Reference< XLibraryContainerPassword > xSourcePasswords( xSourceLibraries, UNO_QUERY );
             OSL_ENSURE( xSourcePasswords.is(),
@@ -1377,12 +1377,12 @@ namespace dbmm
             if ( _eScriptType == eBasic )
             {
                 xTargetLibraries.set( DocumentScriptLibraryContainer::create(
-                    m_aContext, xStorageDoc ), UNO_QUERY_THROW );
+                    m_aContext, xStorageDoc ), UNO_SET_THROW );
             }
             else
             {
                 xTargetLibraries.set( DocumentDialogLibraryContainer::create(
-                    m_aContext, xStorageDoc ), UNO_QUERY_THROW );
+                    m_aContext, xStorageDoc ), UNO_SET_THROW );
             }
 
             // copy all libs to the target, with potentially renaming them
@@ -1429,7 +1429,7 @@ namespace dbmm
 
                     // copy the content of this particular library
                     Reference< XNameAccess > xSourceLib( xSourceLibraries->getByName( *pSourceLibName ), UNO_QUERY_THROW );
-                    Reference< XNameContainer > xTargetLib( xTargetLibraries->createLibrary( sNewLibName ), UNO_QUERY_THROW );
+                    Reference< XNameContainer > xTargetLib( xTargetLibraries->createLibrary( sNewLibName ), UNO_SET_THROW );
 
                     Sequence< OUString > aLibElementNames( xSourceLib->getElementNames() );
                     for ( auto const & sourceElementName : aLibElementNames )
@@ -1679,7 +1679,7 @@ namespace dbmm
         {
             // load a dialog model from the stream describing it
             Reference< XInputStreamProvider > xISP( _inout_rDialogLibraryElement, UNO_QUERY_THROW );
-            Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
+            Reference< XInputStream > xInput( xISP->createInputStream(), UNO_SET_THROW );
 
             Reference< XNameContainer > xDialogModel( m_aContext->getServiceManager()->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", m_aContext), UNO_QUERY_THROW );
             ::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext, m_xDocumentModel );
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 8f5560c9dc4d..3d0b0d0c1f16 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -488,7 +488,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
         try
         {
             Reference< XModel2 > xModel2( xModel, UNO_QUERY_THROW );
-            Reference< XController2 > xController( xModel2->createViewController( sViewName, Sequence< PropertyValue >(), rFrame ), UNO_QUERY_THROW );
+            Reference< XController2 > xController( xModel2->createViewController( sViewName, Sequence< PropertyValue >(), rFrame ), UNO_SET_THROW );
 
             xController->attachModel( xModel );
             xModel->connectController( xController.get() );
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a674fce529d6..9dbb729f7d47 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -346,7 +346,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
             pMedium = new SfxMedium(sFileName, (StreamMode::READ | StreamMode::NOCREATE));
             try
             {
-                xStorage.set(pMedium->GetStorage(false), UNO_QUERY_THROW);
+                xStorage.set(pMedium->GetStorage(false), UNO_SET_THROW);
 
                 if (!sStreamRelPath.isEmpty())
                     xStorage = xStorage->openStorageElement(sStreamRelPath, embed::ElementModes::READ);
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index fbe02ea6a9d5..f5b8455b037d 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -286,8 +286,8 @@ namespace sdbtools
         {
             Reference< XTablesSupplier > xSuppTables( _rxConnection, UNO_QUERY_THROW );
             Reference< XQueriesSupplier > xQueriesSupplier( _rxConnection, UNO_QUERY_THROW );
-            xTables.set( xSuppTables->getTables(), UNO_QUERY_THROW );
-            xQueries.set( xQueriesSupplier->getQueries(), UNO_QUERY_THROW );
+            xTables.set( xSuppTables->getTables(), css::uno::UNO_SET_THROW );
+            xQueries.set( xQueriesSupplier->getQueries(), css::uno::UNO_SET_THROW );
         }
         catch( const Exception& )
         {
@@ -318,7 +318,7 @@ namespace sdbtools
         Reference< XDatabaseMetaData > xMeta;
         try
         {
-            xMeta.set( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+            xMeta.set( _rxConnection->getMetaData(), css::uno::UNO_SET_THROW );
         }
         catch( const Exception& )
         {
@@ -377,7 +377,7 @@ namespace sdbtools
     OUString SAL_CALL ObjectNames::convertToSQLName( const OUString& Name )
     {
         EntryGuard aGuard( *this );
-        Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), css::uno::UNO_SET_THROW );
         return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() );
     }
 
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 2766d590794f..91f2cf928ac5 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -118,7 +118,7 @@ namespace sdbtools
         EntryGuard aGuard( *this );
 
         Reference< XTablesSupplier > xSuppTables( getConnection(), UNO_QUERY_THROW );
-        Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xTables( xSuppTables->getTables(), css::uno::UNO_SET_THROW );
 
         Reference< XPropertySet > xTable;
         try
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 2e4512575a3a..842a48c8c659 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -98,11 +98,11 @@ void OApplicationController::convertToView(const OUString& _sName)
     {
         SharedConnection xConnection( getConnection() );
         Reference< XQueriesSupplier > xSup( xConnection, UNO_QUERY_THROW );
-        Reference< XNameAccess > xQueries( xSup->getQueries(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xQueries( xSup->getQueries(), UNO_SET_THROW );
         Reference< XPropertySet > xSourceObject( xQueries->getByName( _sName ), UNO_QUERY_THROW );
 
         Reference< XTablesSupplier > xTablesSup( xConnection, UNO_QUERY_THROW );
-        Reference< XNameAccess > xTables( xTablesSup->getTables(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xTables( xTablesSup->getTables(), UNO_SET_THROW );
 
         Reference< XDatabaseMetaData  > xMeta = xConnection->getMetaData();
 
@@ -296,8 +296,8 @@ Reference< XDataSource > SAL_CALL OApplicationController::getDataSource()
 Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
 {
     ::osl::MutexGuard aGuard( getMutex() );
-    Reference< XFrame > xFrame( getFrame(), UNO_QUERY_THROW );
-    Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW );
+    Reference< XFrame > xFrame( getFrame(), UNO_SET_THROW );
+    Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_SET_THROW );
     return xWindow;
 }
 
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 200b8edfa7c4..ec92901a2ab7 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -414,11 +414,11 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
 
         // the tables participating in the statement
         const Reference< XTablesSupplier > xSuppTables( xComposer, UNO_QUERY_THROW );
-        const Reference< XNameAccess > xTableNames( xSuppTables->getTables(), UNO_QUERY_THROW );
+        const Reference< XNameAccess > xTableNames( xSuppTables->getTables(), UNO_SET_THROW );
 
         // the columns participating in the statement
         const Reference< XColumnsSupplier > xSuppColumns( xComposer, UNO_QUERY_THROW );
-        const Reference< XNameAccess > xColumnNames( xSuppColumns->getColumns(), UNO_QUERY_THROW );
+        const Reference< XNameAccess > xColumnNames( xSuppColumns->getColumns(), UNO_SET_THROW );
 
         // check if the order columns apply to tables which really exist in the statement
         const Reference< XIndexAccess > xOrderColumns( xComposer->getOrderColumns(), UNO_SET_THROW );
@@ -449,7 +449,7 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
                 }
 
                 const Reference< XColumnsSupplier > xSuppTableColumns( xTableNames->getByName( sTableName ), UNO_QUERY_THROW );
-                const Reference< XNameAccess > xTableColumnNames( xSuppTableColumns->getColumns(), UNO_QUERY_THROW );
+                const Reference< XNameAccess > xTableColumnNames( xSuppTableColumns->getColumns(), UNO_SET_THROW );
                 if ( !xTableColumnNames->hasByName( sColumnName ) )
                 {
                     invalidColumn = true;
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 5dc8186b4c73..4cc0885d8112 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -258,7 +258,7 @@ void OTableTreeListBox::UpdateTableList(
     aTables.resize(_rTables.getLength());
     try
     {
-        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
         std::transform( _rTables.begin(), _rTables.end(),
             aTables.begin(), OViewSetter( _rViews, xMeta->supportsMixedCaseQuotedIdentifiers() ) );
     }
@@ -279,7 +279,7 @@ void TableTreeListBox::UpdateTableList(
     aTables.resize(_rTables.getLength());
     try
     {
-        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
         std::transform( _rTables.begin(), _rTables.end(),
             aTables.begin(), OViewSetter( _rViews, xMeta->supportsMixedCaseQuotedIdentifiers() ) );
     }
@@ -322,7 +322,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
             return;
 
         // get the table/view names
-        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
         for (auto const& table : _rTables)
         {
             // add the entry
@@ -406,7 +406,7 @@ void TableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConne
             return;
 
         // get the table/view names
-        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
         for (auto const& table : _rTables)
         {
             // add the entry
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 1a1d1035a6c7..1add8474188e 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -119,7 +119,7 @@ OUString TableListFacade::getSelectedName( OUString& _out_rAliasName ) const
     OUString aComposedName;
     try
     {
-        Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_SET_THROW );
         if (  aCatalog.isEmpty()
             && !aSchema.isEmpty()
             && xMeta->supportsCatalogsInDataManipulation()
@@ -294,7 +294,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
         OUString aQueryImage(ImageProvider::getDefaultImageResourceID(css::sdb::application::DatabaseObject::QUERY));
 
         Reference< XQueriesSupplier > xSuppQueries( m_xConnection, UNO_QUERY_THROW );
-        Reference< XNameAccess > xQueries( xSuppQueries->getQueries(), UNO_QUERY_THROW );
+        Reference< XNameAccess > xQueries( xSuppQueries->getQueries(), UNO_SET_THROW );
         if ( !m_pContainerListener.is() )
         {
             Reference< XContainer> xContainer(xQueries,UNO_QUERY_THROW);
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 8716ff3af1a4..09c950d02b99 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -161,7 +161,7 @@ void lcl_fillComboList( weld::ComboBox& _rList, const Reference< XConnection >&
                         FGetMetaStrings GetAll, const OUString& _rCurrent )
 {
     try {
-        Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMetaData( _rxConnection->getMetaData(), UNO_SET_THROW );
 
         Reference< XResultSet > xRes = (xMetaData.get()->*GetAll)();
         Reference< XRow > xRow( xRes, UNO_QUERY_THROW );
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index af788f258ba0..1be97ad25ec9 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -134,7 +134,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow()
         const OUString sNameProperty = "Name";
         const OUString sAscendingProperty = "IsAscending";
 
-        Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_QUERY_THROW );
+        Reference< XIndexAccess > xOrderColumns( m_xQueryComposer->getOrderColumns(), UNO_SET_THROW );
         sal_Int32 nColumns = xOrderColumns->getCount();
         if ( nColumns > DOG_ROWS )
             nColumns = DOG_ROWS;
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 38458e8af440..ca8dac4694f4 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -479,8 +479,8 @@ namespace
 
     bool lcl_sameConnection_throw( const Reference< XConnection >& _rxLHS, const Reference< XConnection >& _rxRHS )
     {
-        Reference< XDatabaseMetaData > xMetaLHS( _rxLHS->getMetaData(), UNO_QUERY_THROW );
-        Reference< XDatabaseMetaData > xMetaRHS( _rxRHS->getMetaData(), UNO_QUERY_THROW );
+        Reference< XDatabaseMetaData > xMetaLHS( _rxLHS->getMetaData(), UNO_SET_THROW );
+        Reference< XDatabaseMetaData > xMetaRHS( _rxRHS->getMetaData(), UNO_SET_THROW );
         return xMetaLHS->getURL() == xMetaRHS->getURL();
     }
 }
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index e68f17ffd3ca..9ca8048b9e0e 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -134,7 +134,7 @@ namespace dbaui
                     pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WindowExtendedStyle::Document );
                 }
 
-                Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_QUERY_THROW );
+                Reference< XComponentLoader > xFrameLoader( m_xFrameLoader, UNO_SET_THROW );
                 xReturn = xFrameLoader->loadComponentFromURL(
                     m_sComponentURL,
                     "_self",
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 25a2cb93f26b..2cab54cad51d 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -463,7 +463,7 @@ void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString&
             {
                 Reference< XPropertySet > xProp( xKeyIndex->getByIndex(i), UNO_QUERY_THROW );
                 xColumnsSupplier.set( xProp, UNO_QUERY_THROW );
-                xFKeyColumns.set( xColumnsSupplier->getColumns(), UNO_QUERY_THROW );
+                xFKeyColumns.set( xColumnsSupplier->getColumns(), UNO_SET_THROW );
 
                 sal_Int32 nKeyType = 0;
                 xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType;
@@ -511,7 +511,7 @@ void OQueryTableView::AddTabWin(const OUString& _rComposedName, const OUString&
                             continue;
 
                         Reference<XColumnsSupplier> xFKColumnsSupplier( xFKKey, UNO_QUERY_THROW );
-                        Reference< XNameAccess > xTColumns( xFKColumnsSupplier->getColumns(), UNO_QUERY_THROW );
+                        Reference< XNameAccess > xTColumns( xFKColumnsSupplier->getColumns(), UNO_SET_THROW );
                         addConnections( this, *pTabWinTmp, *pNewTabWin, xTColumns );
                     }
                 }
diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx
index 02c9204aa039..30a4ef37ae08 100644
--- a/dbaccess/source/ui/querydesign/TableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx
@@ -90,11 +90,11 @@ bool OTableWindowData::init(const Reference< XConnection  >& _xConnection,bool _
     ::osl::MutexGuard aGuard( m_aMutex );
 
     Reference< XQueriesSupplier > xSupQueries( _xConnection, UNO_QUERY_THROW );
-    Reference< XNameAccess > xQueries( xSupQueries->getQueries(), UNO_QUERY_THROW );
+    Reference< XNameAccess > xQueries( xSupQueries->getQueries(), UNO_SET_THROW );
     bool bIsKnownQuery = _bAllowQueries && xQueries->hasByName( m_sComposedName );
 
     Reference< XTablesSupplier > xSupTables( _xConnection, UNO_QUERY_THROW );
-    Reference< XNameAccess > xTables( xSupTables->getTables(), UNO_QUERY_THROW );
+    Reference< XNameAccess > xTables( xSupTables->getTables(), UNO_SET_THROW );
     bool bIsKnownTable = xTables->hasByName( m_sComposedName );
 
     if ( bIsKnownQuery )
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index a5dcd743208b..295575187044 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1092,7 +1092,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou
     if ( !m_xDestConnection.is() )
         throw RuntimeException( "m_xDestConnection is set to null, CopyTableWizard::impl_copyRows_throw: illegal call!", *this );
 
-    Reference< XDatabaseMetaData > xDestMetaData( m_xDestConnection->getMetaData(), UNO_QUERY_THROW );
+    Reference< XDatabaseMetaData > xDestMetaData( m_xDestConnection->getMetaData(), UNO_SET_THROW );
 
     const OCopyTableWizard& rWizard             = impl_getDialog_throw();
     ODatabaseExport::TPositions aColumnPositions = rWizard.GetColumnPositions();
@@ -1424,7 +1424,7 @@ OUString CopyTableWizard::impl_getServerSideCopyStatement_throw(const Reference<
 {
     const Reference<XColumnsSupplier> xDestColsSup(_xTable,UNO_QUERY_THROW);
     const Sequence< OUString> aDestColumnNames = xDestColsSup->getColumns()->getElementNames();
-    const Reference< XDatabaseMetaData > xDestMetaData( m_xDestConnection->getMetaData(), UNO_QUERY_THROW );
+    const Reference< XDatabaseMetaData > xDestMetaData( m_xDestConnection->getMetaData(), UNO_SET_THROW );
     const OUString sQuote = xDestMetaData->getIdentifierQuoteString();
     OUStringBuffer sColumns;
     // 1st check if the columns matching