use uno::Reference::set method instead of assignment

Change-Id: I080668f86f0ab8b3bba857ee21411f907ae285c4

15 files changed, 25 insertions, 28 deletions

diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index d6eb7e4c4bf9..573a30e1a979 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -46,7 +46,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
         try
         {
             m_xTables = _rxMeta->getTables(catalog,schemaPattern,tableNamePattern,sTableTypes);
-            m_xRow = Reference< XRow>(m_xTables,UNO_QUERY);
+            m_xRow.set(m_xTables,UNO_QUERY);
 
             sUserWorkingFor = _rxMeta->getUserName();
         }
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a5ef047bd7e6..3380879e2876 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -998,7 +998,7 @@ try
     // for formatted fields (either old or new) we have some special treatments
     Reference< XServiceInfo > xSI( xOldProps, UNO_QUERY );
     bool bOldIsFormatted = xSI.is() && xSI->supportsService( sFormattedServiceName );
-    xSI = Reference< XServiceInfo >( xNewProps, UNO_QUERY );
+    xSI.set( xNewProps, UNO_QUERY );
     bool bNewIsFormatted = xSI.is() && xSI->supportsService( sFormattedServiceName );
 
     if (!bOldIsFormatted && !bNewIsFormatted)
@@ -1701,7 +1701,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
     OSL_ENSURE(_rxHandler.is(),"dbtools::askForParameters XInteractionHandler is null!");
 
     // we have to set this here again because getCurrentSettingsComposer can force a setpropertyvalue
-    Reference<XParametersSupplier>  xParameters = Reference<XParametersSupplier> (_xComposer, UNO_QUERY);
+    Reference<XParametersSupplier>  xParameters(_xComposer, UNO_QUERY);
 
     Reference<XIndexAccess>  xParamsAsIndicies = xParameters.is() ? xParameters->getParameters() : Reference<XIndexAccess>();
     sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 7f5b6809dfb1..c59a5513e491 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -296,8 +296,8 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
                     bPKey = true;
-                    xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY);
-                    xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY);
+                    xColumnSup.set(xColProp,UNO_QUERY);
+                    xColumns.set(xColumnSup->getColumns(),UNO_QUERY);
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
@@ -306,8 +306,8 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
                 }
                 else if(nKeyType == KeyType::UNIQUE)
                 {
-                    xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY);
-                    xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY);
+                    xColumnSup.set(xColProp,UNO_QUERY);
+                    xColumns.set(xColumnSup->getColumns(),UNO_QUERY);
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
@@ -318,8 +318,8 @@ OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,
                 {
                     sal_Int32 nDeleteRule   = getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DELETERULE)));
 
-                    xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY);
-                    xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY);
+                    xColumnSup.set(xColProp,UNO_QUERY);
+                    xColumns.set(xColumnSup->getColumns(),UNO_QUERY);
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 5a4fe74a7913..c8c719406181 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -106,10 +106,7 @@ namespace dbtools
             OSL_ENSURE( rxContext.is(), "OPredicateInputController::OPredicateInputController: need a service factory!" );
             if ( rxContext.is() )
             {
-                m_xFormatter = Reference< XNumberFormatter >(
-                    NumberFormatter::create(rxContext),
-                    UNO_QUERY_THROW
-                );
+                m_xFormatter.set( NumberFormatter::create(rxContext), UNO_QUERY_THROW );
             }
 
             Reference< XNumberFormatsSupplier >  xNumberFormats = ::dbtools::getNumberFormats( m_xConnection, true );
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index d4defb5d8db9..d780e3181e42 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -47,7 +47,7 @@ namespace connectivity
             _rxAggregateDriver = NULL;
 
             // a second "real" reference
-            m_xDriver = Reference< XDriver >(m_xDriverAggregate, UNO_QUERY);
+            m_xDriver.set(m_xDriverAggregate, UNO_QUERY);
             OSL_ENSURE(m_xDriver.is(), "ODriverWrapper::ODriverWrapper: invalid aggregate (no XDriver)!");
 
             // set ourself as delegator
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 13d11ac01c22..55b488906f46 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -61,7 +61,7 @@ void OStatementCommonBase::disposeResultSet()
     uno::Reference< XComponent > xComp(m_xResultSet.get(), UNO_QUERY);
     if (xComp.is())
         xComp->dispose();
-    m_xResultSet = uno::Reference< XResultSet>();
+    m_xResultSet.clear();
 }
 
 void OStatementCommonBase::freeStatementHandle()
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 6ca1953449e9..2e4c7560a28d 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -461,7 +461,7 @@ namespace connectivity
         {
             if ( i->second.second.first.get() == connection.get() )
             {
-                xTab = Reference< XTablesSupplier >(i->second.second.second.get().get(),UNO_QUERY);
+                xTab.set(i->second.second.second.get().get(),UNO_QUERY);
                 if ( !xTab.is() )
                 {
                     xTab = new OHCatalog(connection);
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index a7ece0a27cf3..7d334018377f 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -460,7 +460,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql));
             impl_throwError(STR_QUERY_TOO_COMPLEX);
     }
 
-    m_xResultSet = Reference<XResultSet>(pResult);
+    m_xResultSet.set(pResult);
     return xRS;
 }
 
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index bdb6edeb6ab4..0d6883faf07d 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -182,7 +182,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
 
             m_pTable = static_cast< OTable* > (xTabs.begin()->second.get());
             m_xColNames     = m_pTable->getColumns();
-            xNames = Reference<XIndexAccess>(m_xColNames,UNO_QUERY);
+            xNames.set(m_xColNames,UNO_QUERY);
             // set the binding of the resultrow
             m_aRow          = new OValueVector(xNames->getCount());
             (m_aRow->get())[0].setBound(true);
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index f69c031e9866..60662f347fcf 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -410,7 +410,7 @@ namespace connectivity
                 {
                     if ( i->second.second == pConnection )
                     {
-                        xTab = Reference< XTablesSupplier >(i->second.first.get().get(),UNO_QUERY);
+                        xTab.set(i->second.first.get().get(),UNO_QUERY);
                         if ( !xTab.is() )
                         {
                             xTab = new OMySQLCatalog(connection);
@@ -429,7 +429,7 @@ namespace connectivity
                 Reference< XConnection > xTemp(i->first.get(),UNO_QUERY);
                 if ( xTemp == connection )
                 {
-                    xTab = Reference< XTablesSupplier >(i->second.first.get().get(),UNO_QUERY);
+                    xTab.set(i->second.first.get().get(),UNO_QUERY);
                     if ( !xTab.is() )
                     {
                         xTab = new OMySQLCatalog(connection);
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 701bad72a47c..a742d4aa7742 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1436,7 +1436,7 @@ static void columnMetaData2DatabaseTypeDescription(
     if( domains )
     {
         Reference< XResultSet > rsDomain = stmt->executeQuery( queryBuf.makeStringAndClear() );
-        row = Reference< XRow >( rsDomain, UNO_QUERY_THROW );
+        row.set( rsDomain, UNO_QUERY_THROW );
         while( rsDomain->next() )
         {
             oidMap[row->getInt(1)] = DatabaseTypeDescription(row->getString(3), row->getString(2) );
@@ -1815,12 +1815,12 @@ static void columnMetaData2DatabaseTypeDescription(
                 "pg_attribute AS att, pg_class AS cl WHERE "
                 "att.attrelid = ? AND att.attnum = ?" );
 
-        parameters = Reference< XParameters >( statement, UNO_QUERY_THROW );
+        parameters.set( statement, UNO_QUERY_THROW );
         parameters->setString( 1 , tableOid );
         parameters->setString( 2 , attnum );
 
         rs = statement->executeQuery();
-        xRow = Reference< XRow >( rs, UNO_QUERY_THROW );
+        xRow.set( rs, UNO_QUERY_THROW );
         if( rs->next() )
         {
             // column name
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 672d0ee974b2..8ff522348834 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -270,7 +270,7 @@ void OOneInstanceComponentFactory::disposing()
     Reference< XComponent > rComp;
     {
         MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        rComp = Reference< XComponent >( m_theInstance, UNO_QUERY );
+        rComp.set( m_theInstance, UNO_QUERY );
         m_theInstance.clear();
     }
     if( rComp.is() )
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index f11ada3dfb64..6e624ac1316f 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -429,7 +429,7 @@ sal_Bool PreparedStatement::execute( )
     data.pLastTableInserted = &m_lastTableInserted;
     data.pLastResultset = &m_lastResultset;
     data.owner = *this;
-    data.tableSupplier = Reference< com::sun::star::sdbcx::XTablesSupplier >( m_connection, UNO_QUERY );
+    data.tableSupplier.set( m_connection, UNO_QUERY );
     data.concurrency = extractIntProperty( this, getStatics().RESULT_SET_CONCURRENCY );
 
     return executePostgresCommand( m_executedStatement , &data );   // see pq_statement.cxx
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index e37e7f9d5dc6..03c1c31d5576 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -368,7 +368,7 @@ static Sequence< OUString > lookupKeys(
                         }
                         break;
                     }
-                    keySupplier = Reference< XKeysSupplier > ( set, UNO_QUERY );
+                    keySupplier.set( set, UNO_QUERY );
                 }
             }
         }
@@ -854,7 +854,7 @@ sal_Bool Statement::execute( const OUString& sql )
     data.pLastTableInserted = &m_lastTableInserted;
     data.pLastResultset = &m_lastResultset;
     data.owner = *this;
-    data.tableSupplier = Reference< com::sun::star::sdbcx::XTablesSupplier >( m_connection, UNO_QUERY );
+    data.tableSupplier.set( m_connection, UNO_QUERY );
     data.concurrency =
         extractIntProperty( this, getStatics().RESULT_SET_CONCURRENCY );
     return executePostgresCommand( cmd , &data );
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index 346f60020ca7..3769c478e72d 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -53,7 +53,7 @@ void main( int argc, char * argv[] )
         if(!xFac.is())
             return;
 
-        m_xDriver = Reference<XDriver>(xFac->createInstance("com.sun.star.sdbc.driver.dbase.Driver"),UNO_QUERY);
+        m_xDriver.set(xFac->createInstance("com.sun.star.sdbc.driver.dbase.Driver"),UNO_QUERY);
         if(m_xDriver.is())
         {