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>

7 files changed, 16 insertions, 16 deletions

diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index bba4cd65bc33..ca91c1401749 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -810,9 +810,9 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection,
         ::utl::SharedUNOComponent< XStatement > xStmt( _xConnection->createStatement() );
         Reference< XPropertySet > xStatementProps( xStmt, UNO_QUERY_THROW );
         xStatementProps->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ESCAPEPROCESSING ), makeAny( false ) );
-        Reference< XResultSet > xResult( xStmt->executeQuery( sSelect ), UNO_QUERY_THROW );
+        Reference< XResultSet > xResult( xStmt->executeQuery( sSelect ), UNO_SET_THROW );
         Reference< XResultSetMetaDataSupplier > xSuppMeta( xResult, UNO_QUERY_THROW );
-        Reference< XResultSetMetaData > xMeta( xSuppMeta->getMetaData(), UNO_QUERY_THROW );
+        Reference< XResultSetMetaData > xMeta( xSuppMeta->getMetaData(), UNO_SET_THROW );
 
         sal_Int32 nCount = xMeta->getColumnCount();
         OSL_ENSURE( nCount != 0, "::dbtools::collectColumnInformation: result set has empty (column-less) meta data!" );
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index be9a133d6923..0bc5c91abd4d 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -149,7 +149,7 @@ namespace dbtools
                 }
 
                 // get the format key of our bound field
-                Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW );
+                Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_SET_THROW );
                 bool bHaveFieldFormat = false;
                 const OUString sFormatKeyProperty( "FormatKey" );
                 if ( xPSI->hasPropertyByName( sFormatKeyProperty ) )
@@ -166,7 +166,7 @@ namespace dbtools
 
                 // some more formatter settings
                 _rData.m_nKeyType  = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey );
-                Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW );
+                Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_SET_THROW );
                 OSL_VERIFY( xFormatSettings->getPropertyValue("NullDate") >>= _rData.m_aNullDate );
 
                 // remember the formatter
@@ -190,7 +190,7 @@ namespace dbtools
             try
             {
                 // get the number formats supplier of the connection of the form
-                Reference< XConnection > xConnection( getConnection( i_rRowSet ), UNO_QUERY_THROW );
+                Reference< XConnection > xConnection( getConnection( i_rRowSet ), UNO_SET_THROW );
                 Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection, true, i_rContext ), UNO_SET_THROW );
 
                 // create a number formatter for it
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 790ecb03899f..54b381b72bb7 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -266,7 +266,7 @@ namespace param
         :ParameterWrapperContainer_Base( m_aMutex )
     {
         Reference< XParametersSupplier > xSuppParams( _rxComposer, UNO_QUERY_THROW );
-        Reference< XIndexAccess > xParameters( xSuppParams->getParameters(), UNO_QUERY_THROW );
+        Reference< XIndexAccess > xParameters( xSuppParams->getParameters(), css::uno::UNO_SET_THROW );
         sal_Int32 nParamCount( xParameters->getCount() );
         m_aParameters.reserve( nParamCount );
         for ( sal_Int32 i=0; i<nParamCount; ++i )
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index e3346e031775..a21c8cf1a41d 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -138,7 +138,7 @@ namespace dbtools
                     {
                         // ask the connection for the query
                         Reference< XQueriesSupplier > xSupplyQueries( _rData.xConnection, UNO_QUERY_THROW );
-                        Reference< XNameAccess >      xQueries( xSupplyQueries->getQueries(), UNO_QUERY_THROW );
+                        Reference< XNameAccess >      xQueries( xSupplyQueries->getQueries(), css::uno::UNO_SET_THROW );
 
                         if ( !xQueries->hasByName( _rData.sCommand ) )
                             break;
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 9a63991320d8..22fcdaa466e2 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -143,7 +143,7 @@ namespace connectivity { namespace hsqldb
                 {
                     if ( !m_bReadOnly )
                     {
-                        Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW );
+                        Reference< XStatement > xStmt( m_xConnection->createStatement(), css::uno::UNO_SET_THROW );
                         xStmt->execute( "CHECKPOINT DEFRAG" );
                     }
                 }
@@ -223,8 +223,8 @@ namespace connectivity { namespace hsqldb
         {
             Reference< XConnection > xMe( *this, UNO_QUERY );
             Reference< XDataDefinitionSupplier > xDefinitionsSupp( m_xDriver, UNO_QUERY_THROW );
-            Reference< XTablesSupplier > xTablesSupp( xDefinitionsSupp->getDataDefinitionByConnection( xMe ), UNO_QUERY_THROW );
-            xTables.set( xTablesSupp->getTables(), UNO_QUERY_THROW );
+            Reference< XTablesSupplier > xTablesSupp( xDefinitionsSupp->getDataDefinitionByConnection( xMe ), css::uno::UNO_SET_THROW );
+            xTables.set( xTablesSupp->getTables(), css::uno::UNO_SET_THROW );
         }
         catch( const RuntimeException& ) { throw; }
         catch( const Exception& )
@@ -246,7 +246,7 @@ namespace connectivity { namespace hsqldb
         bool bDoesExist = false;
         try
         {
-            Reference< XNameAccess > xTables( impl_getTableContainer_throw(), UNO_QUERY_THROW );
+            Reference< XNameAccess > xTables( impl_getTableContainer_throw(), css::uno::UNO_SET_THROW );
             bDoesExist = xTables->hasByName( _rTableName );
         }
         catch( const Exception& )
@@ -276,7 +276,7 @@ namespace connectivity { namespace hsqldb
             Reference< XConnection > xMe( *this, UNO_QUERY_THROW );
 
             // split the fully qualified name
-            Reference< XDatabaseMetaData > xMetaData( xMe->getMetaData(), UNO_QUERY_THROW );
+            Reference< XDatabaseMetaData > xMetaData( xMe->getMetaData(), css::uno::UNO_SET_THROW );
             OUString sCatalog, sSchema, sName;
             ::dbtools::qualifiedNameComponents( xMetaData, _rTableName, sCatalog, sSchema, sName, ::dbtools::EComposeRule::Complete );
 
@@ -286,8 +286,8 @@ namespace connectivity { namespace hsqldb
             HTools::appendTableFilterCrit( sSQL, sCatalog, sSchema, sName, true );
             sSQL.append( " AND TABLE_TYPE = 'TABLE'" );
 
-            Reference< XStatement > xStatement( xMe->createStatement(), UNO_QUERY_THROW );
-            Reference< XResultSet > xTableHsqlType( xStatement->executeQuery( sSQL.makeStringAndClear() ), UNO_QUERY_THROW );
+            Reference< XStatement > xStatement( xMe->createStatement(), css::uno::UNO_SET_THROW );
+            Reference< XResultSet > xTableHsqlType( xStatement->executeQuery( sSQL.makeStringAndClear() ), css::uno::UNO_SET_THROW );
 
             if ( xTableHsqlType->next() )   // might not succeed in case of VIEWs
             {
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index ac89a718bbf1..810acdf08561 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -157,7 +157,7 @@ namespace connectivity { namespace hsqldb
         aCommand.append( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
         HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, m_Name, false );
         ::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
-        Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
+        Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), css::uno::UNO_SET_THROW );
         if ( !xResult->next() )
         {
             // hmm. There is no view the name as we know it. Can only mean some other instance
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
index 8b8e4c96e810..d7a82dd95034 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
@@ -84,7 +84,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column )
     OUString sColumnName;
     try
     {
-        Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_QUERY_THROW );
+        Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_SET_THROW );
         OSL_VERIFY( xColumnProps->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) >>= sColumnName );
     }
     catch( const Exception& )