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

Change-Id: Id036f867e75d03d8347cc32a1011c5cdda1dcc73

34 files changed, 66 insertions, 110 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 5b097fc2de88..6e593b035bde 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -700,10 +700,10 @@ CachedContentResultSet::CachedContentResultSet(
                 , m_bTriedToGetTypeConverter( false )
                 , m_xTypeConverter( NULL )
 {
-    m_xFetchProvider = Reference< XFetchProvider >( m_xResultSetOrigin, UNO_QUERY );
+    m_xFetchProvider.set( m_xResultSetOrigin, UNO_QUERY );
     OSL_ENSURE( m_xFetchProvider.is(), "interface XFetchProvider is required" );
 
-    m_xFetchProviderForContentAccess = Reference< XFetchProviderForContentAccess >( m_xResultSetOrigin, UNO_QUERY );
+    m_xFetchProviderForContentAccess.set( m_xResultSetOrigin, UNO_QUERY );
     OSL_ENSURE( m_xFetchProviderForContentAccess.is(), "interface XFetchProviderForContentAccess is required" );
 
     impl_init();
@@ -2190,7 +2190,7 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
     if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() )
     {
         m_bTriedToGetTypeConverter = true;
-        m_xTypeConverter = Reference< XTypeConverter >( Converter::create(m_xContext) );
+        m_xTypeConverter.set( Converter::create(m_xContext) );
 
         OSL_ENSURE( m_xTypeConverter.is(),
                     "PropertyValueSet::getTypeConverter() - "
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 1c4a1276831c..f592ea50f324 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -58,7 +58,7 @@ ContentResultSetWrapper::ContentResultSetWrapper(
                 , m_pVetoableChangeListeners( NULL )
 {
     m_pMyListenerImpl = new ContentResultSetWrapperListener( this );
-    m_xMyListenerImpl = Reference< XPropertyChangeListener >( m_pMyListenerImpl );
+    m_xMyListenerImpl.set( m_pMyListenerImpl );
 
     OSL_ENSURE( m_xResultSetOrigin.is(), "XResultSet is required" );
 
@@ -471,8 +471,7 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData()
     ReacquireableGuard aGuard( m_aMutex );
     if( !m_xMetaDataFromOrigin.is() && m_xResultSetOrigin.is() )
     {
-        Reference< XResultSetMetaDataSupplier > xMetaDataSupplier
-            = Reference< XResultSetMetaDataSupplier >(
+        Reference< XResultSetMetaDataSupplier > xMetaDataSupplier(
                 m_xResultSetOrigin, UNO_QUERY );
 
         if( xMetaDataSupplier.is() )
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 13e156ce293c..fc25344e0297 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -59,7 +59,7 @@ DynamicResultSetWrapper::DynamicResultSetWrapper(
                 , m_xListener( NULL )
 {
     m_pMyListenerImpl = new DynamicResultSetWrapperListener( this );
-    m_xMyListenerImpl = Reference< XDynamicResultSetListener >( m_pMyListenerImpl );
+    m_xMyListenerImpl.set( m_pMyListenerImpl );
     //call impl_init() at the end of constructor of derived class
 };
 
@@ -146,7 +146,7 @@ void SAL_CALL DynamicResultSetWrapper::dispose()
             return;
         m_bInDispose = true;
 
-        xSourceComponent = Reference< XComponent >(m_xSource, UNO_QUERY);
+        xSourceComponent.set(m_xSource, UNO_QUERY);
 
         if( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() )
         {
@@ -341,7 +341,7 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper::getStaticResultSet()
 
         xSource = m_xSource;
         m_bStatic = true;
-        xMyListenerImpl = Reference< XEventListener > ::query( m_xMyListenerImpl );
+        xMyListenerImpl.set( m_xMyListenerImpl, UNO_QUERY );
     }
 
     if( xSource.is() )
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 21ffe5fa58b5..3dffc8d5bbbd 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -570,7 +570,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     Reference< XActiveDataStreamer > xSink = static_cast<XActiveDataStreamer*>(new OActiveDataStreamer());
-    Reference< XInterface > xSinkIface = Reference< XInterface >::query( xSink );
+    Reference< XInterface > xSinkIface( xSink, UNO_QUERY );
 
     OpenCommandArgument2 aArg;
     aArg.Mode       = OpenMode::DOCUMENT;
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index b77ab69b7b55..70d3d94c61da 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -310,9 +310,7 @@ UcbContentProviderProxy::getContentProvider()
     {
         try
         {
-            m_xProvider
-                = Reference< XContentProvider >(
-                      m_xSMgr->createInstance( m_aService ), UNO_QUERY );
+            m_xProvider.set( m_xSMgr->createInstance( m_aService ), UNO_QUERY );
             if ( m_aArguments == "NoConfig" )
             {
                 Reference<XInitialization> xInit(m_xProvider,UNO_QUERY);
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 0bd9b9266aa9..7ed2fff9464e 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -905,8 +905,7 @@ bool UniversalContentBroker::getContentProviderData(
 
         if ( !m_xNotifier.is() )
         {
-            m_xNotifier = uno::Reference< util::XChangesNotifier >(
-                                                xInterface, uno::UNO_QUERY_THROW );
+            m_xNotifier.set( xInterface, uno::UNO_QUERY_THROW );
 
             m_xNotifier->addChangesListener( this );
         }
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 3a7ff47207b3..935ba2faf4fc 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -966,8 +966,7 @@ uno::Reference< io::XInputStream > getInputStream(
 
             xCommandProcessorS->execute( aOpenCommand, 0, rContext.xEnv );
 
-            xInputStream = uno::Reference< io::XInputStream >(
-                                    xOutputStream, uno::UNO_QUERY );
+            xInputStream.set( xOutputStream, uno::UNO_QUERY );
         }
         catch ( uno::RuntimeException const & )
         {
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index a26c2b0e70df..63075b27ce89 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -65,7 +65,7 @@ SortedDynamicResultSet::SortedDynamicResultSet(
     mpDisposeEventListeners = NULL;
     mpOwnListener           = new SortedDynamicResultSetListener( this );
 
-    mxOwnListener = Reference< XDynamicResultSetListener >( mpOwnListener );
+    mxOwnListener.set( mpOwnListener );
 
     mxOriginal  = xOriginal;
     maOptions   = aOptions;
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index bc0f7e066aa1..64d3ec07d96d 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -978,8 +978,8 @@ sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne,
 
     throw( SQLException, RuntimeException )
 {
-    Reference < XRow > xRowOne = Reference< XRow >::query( xResultOne );
-    Reference < XRow > xRowTwo = Reference< XRow >::query( xResultTwo );
+    Reference < XRow > xRowOne( xResultOne, UNO_QUERY );
+    Reference < XRow > xRowTwo( xResultTwo, UNO_QUERY );
 
     sal_IntPtr nCompare = 0;
     sal_IntPtr nColumn = pSortInfo->mnColumn;
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 3e52ffb906ed..c50460543db7 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1506,9 +1506,9 @@ namespace cmis
         if ( !xSink.is() )
             return false;
 
-        uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >(xSink, uno::UNO_QUERY );
-        uno::Reference< io::XActiveDataSink > xDataSink = uno::Reference< io::XActiveDataSink >(xSink, uno::UNO_QUERY );
-        uno::Reference< io::XActiveDataStreamer > xDataStreamer = uno::Reference< io::XActiveDataStreamer >( xSink, uno::UNO_QUERY );
+        uno::Reference< io::XOutputStream > xOut(xSink, uno::UNO_QUERY );
+        uno::Reference< io::XActiveDataSink > xDataSink(xSink, uno::UNO_QUERY );
+        uno::Reference< io::XActiveDataStreamer > xDataStreamer( xSink, uno::UNO_QUERY );
 
         if ( !xOut.is() && !xDataSink.is() && ( !xDataStreamer.is() || !xDataStreamer->getStream().is() ) )
             return false;
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index 195847481d10..19754f84c216 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -157,7 +157,7 @@ namespace cmis
     void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
     {
         if ( nIndex < maResults.size() )
-            maResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+            maResults[ nIndex ]->xRow.clear();
     }
 
     void DataSupplier::close()
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 9debd7170304..92c8e6392c64 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -1238,8 +1238,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
     if ( ! success )
         return;
 
-    FileContentIdentifier* p = new FileContentIdentifier( m_aUncPath );
-    m_xContentIdentifier = Reference< XContentIdentifier >( p );
+    m_xContentIdentifier.set( new FileContentIdentifier( m_aUncPath ) );
 
     m_pMyShell->registerNotifier( m_aUncPath,this );
     m_pMyShell->insertDefaultProperties( m_aUncPath );
@@ -1286,7 +1285,7 @@ BaseContent::cEXC( const OUString& aNewName )
     Reference< XContentIdentifier > xOldRef = m_xContentIdentifier;
     m_aUncPath = aNewName;
     FileContentIdentifier* pp = new FileContentIdentifier( aNewName );
-    m_xContentIdentifier = Reference< XContentIdentifier >( pp );
+    m_xContentIdentifier.set( pp );
 
     ContentEventNotifier* p = 0;
     if( m_pContentEventListeners )
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index e4d8159c0dc5..d8438742af8e 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -560,9 +560,7 @@ XResultSet_impl::queryContentIdentifier(
     {
         if( ! m_aIdents[m_nRow].is() )
         {
-            FileContentIdentifier* p
-                = new FileContentIdentifier( m_aUnqPath[  m_nRow ] );
-            m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >(p);
+            m_aIdents[m_nRow].set( new FileContentIdentifier( m_aUnqPath[  m_nRow ] ) );
         }
         return m_aIdents[m_nRow];
     }
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index ba3e638057a8..d51363932d2a 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -447,7 +447,7 @@ void SAL_CALL FileProvider::initProperties()
         // static const sal_Int32 MAC_NOTATION = (sal_Int32)3;
 
         XPropertySetInfoImpl2* p = new XPropertySetInfoImpl2();
-        m_xPropertySetInfo = Reference< XPropertySetInfo >( p );
+        m_xPropertySetInfo.set( p );
     }
 }
 
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx
index b53fc90f18e5..2e764f6115d4 100644
--- a/ucb/source/ucp/ftp/ftpdynresultset.cxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx
@@ -63,13 +63,13 @@ DynamicResultSet::~DynamicResultSet()
 
 void DynamicResultSet::initStatic()
 {
-    m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() );
+    m_xResultSet1.set( m_pFactory->createResultSet() );
 }
 
 
 void DynamicResultSet::initDynamic()
 {
-    m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() );
+    m_xResultSet1.set( m_pFactory->createResultSet() );
 
     m_xResultSet2 = m_xResultSet1;
 }
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 89e1367b04c8..74884498cf3b 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -90,7 +90,7 @@ ResultSetI::ResultSetI(const Reference<XComponentContext>&  rxContext,
             else
                 xRow->appendVoid(seqProp[i]);
         }
-        m_aItems[n] = Reference<XRow>(xRow.get());
+        m_aItems[n].set(xRow.get());
     }
 }
 
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 5fc3e8e6feef..41a5a89cf5f1 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -834,8 +834,8 @@ bool Content::feedSink( uno::Reference< uno::XInterface > xSink,
     if ( !xSink.is() )
         return false;
 
-    uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >(xSink, uno::UNO_QUERY );
-    uno::Reference< io::XActiveDataSink > xDataSink = uno::Reference< io::XActiveDataSink >(xSink, uno::UNO_QUERY );
+    uno::Reference< io::XOutputStream > xOut(xSink, uno::UNO_QUERY );
+    uno::Reference< io::XActiveDataSink > xDataSink(xSink, uno::UNO_QUERY );
 
     if ( !xOut.is() && !xDataSink.is() )
         return false;
diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx
index 02c1e11df61e..cabe44409bce 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.cxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.cxx
@@ -256,7 +256,7 @@ uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nInde
 void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
 {
     if ( nIndex < maResults.size() )
-        maResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+        maResults[ nIndex ]->xRow.clear();
 }
 
 void DataSupplier::close()
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 5d5efeb013ec..0d84c4ee8a1e 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -973,8 +973,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues(
 
                 if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
                 {
-                    xAdditionalPropSet
-                        = uno::Reference< beans::XPropertySet >(
+                    xAdditionalPropSet.set(
                             pProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 0e2ff62efdb9..bd48fe9a6455 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -265,7 +265,7 @@ bool HierarchyEntry::setData(
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
         if ( !m_xConfigProvider.is() )
-            m_xConfigProvider = uno::Reference< lang::XMultiServiceFactory >(
+            m_xConfigProvider.set(
                 m_xContext->getServiceManager()->createInstanceWithContext(m_aServiceSpecifier, m_xContext),
                 uno::UNO_QUERY );
 
@@ -367,8 +367,7 @@ bool HierarchyEntry::setData(
                         // Special handling for children of root,
                         // which is not an entry. It's only a set
                         // of entries.
-                        xFac = uno::Reference< lang::XSingleServiceFactory >(
-                            xParentNameAccess, uno::UNO_QUERY );
+                        xFac.set( xParentNameAccess, uno::UNO_QUERY );
                     }
                     else
                     {
@@ -382,18 +381,14 @@ bool HierarchyEntry::setData(
 
                     if ( xFac.is() )
                     {
-                        xNameReplace
-                            = uno::Reference< container::XNameReplace >(
-                                xFac->createInstance(), uno::UNO_QUERY );
+                        xNameReplace.set( xFac->createInstance(), uno::UNO_QUERY );
 
                         OSL_ENSURE( xNameReplace.is(),
                                 "HierarchyEntry::setData - No name replace!" );
 
                         if ( xNameReplace.is() )
                         {
-                            xContainer
-                                = uno::Reference< container::XNameContainer >(
-                                    xFac, uno::UNO_QUERY );
+                            xContainer.set( xFac, uno::UNO_QUERY );
 
                             OSL_ENSURE( xContainer.is(),
                                 "HierarchyEntry::setData - No container!" );
@@ -517,7 +512,7 @@ bool HierarchyEntry::move(
     try
     {
         if ( !m_xConfigProvider.is() )
-            m_xConfigProvider = uno::Reference< lang::XMultiServiceFactory >(
+            m_xConfigProvider.set(
                 m_xContext->getServiceManager()->createInstanceWithContext(m_aServiceSpecifier, m_xContext),
                 uno::UNO_QUERY );
 
@@ -557,7 +552,7 @@ bool HierarchyEntry::move(
         aProperty.Value <<= aOldParentPath;
         aArguments[ 0 ] <<= aProperty;
 
-        xOldParentBatch = uno::Reference< util::XChangesBatch >(
+        xOldParentBatch.set(
             m_xConfigProvider->createInstanceWithArguments(
                 READWRITE_SERVICE_NAME,
                 aArguments ),
@@ -581,7 +576,7 @@ bool HierarchyEntry::move(
             aProperty.Value <<= aNewParentPath;
             aArguments[ 0 ] <<= aProperty;
 
-            xNewParentBatch = uno::Reference< util::XChangesBatch >(
+            xNewParentBatch.set(
                 m_xConfigProvider->createInstanceWithArguments(
                     READWRITE_SERVICE_NAME,
                     aArguments ),
@@ -616,9 +611,7 @@ bool HierarchyEntry::move(
 
     try
     {
-        xOldParentNameAccess
-            = uno::Reference< container::XNameAccess >(
-                xOldParentBatch, uno::UNO_QUERY );
+        xOldParentNameAccess.set( xOldParentBatch, uno::UNO_QUERY );
 
         OSL_ENSURE( xOldParentNameAccess.is(),
                     "HierarchyEntry::move - No name access!" );
@@ -628,8 +621,7 @@ bool HierarchyEntry::move(
 
         if ( bOldRoot )
         {
-            xOldNameContainer = uno::Reference< container::XNameContainer >(
-                                        xOldParentNameAccess, uno::UNO_QUERY );
+            xOldNameContainer.set( xOldParentNameAccess, uno::UNO_QUERY );
         }
         else
         {
@@ -687,9 +679,7 @@ bool HierarchyEntry::move(
 
         uno::Reference< container::XNameAccess > xNewParentNameAccess;
         if ( bDifferentParents )
-            xNewParentNameAccess
-                = uno::Reference< container::XNameAccess >(
-                    xNewParentBatch, uno::UNO_QUERY );
+            xNewParentNameAccess.set( xNewParentBatch, uno::UNO_QUERY );
         else
             xNewParentNameAccess = xOldParentNameAccess;
 
@@ -704,9 +694,7 @@ bool HierarchyEntry::move(
         {
             if ( bNewRoot )
             {
-                xNewNameContainer
-                    = uno::Reference< container::XNameContainer >(
-                        xNewParentNameAccess, uno::UNO_QUERY );
+                xNewNameContainer.set( xNewParentNameAccess, uno::UNO_QUERY );
             }
             else
             {
@@ -783,7 +771,7 @@ bool HierarchyEntry::remove()
         osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
         if ( !m_xConfigProvider.is() )
-            m_xConfigProvider = uno::Reference< lang::XMultiServiceFactory >(
+            m_xConfigProvider.set(
                 m_xContext->getServiceManager()->createInstanceWithContext(m_aServiceSpecifier, m_xContext),
                 uno::UNO_QUERY );
 
@@ -838,8 +826,7 @@ bool HierarchyEntry::remove()
                     // Special handling for children of root,
                     // which is not an entry. It's only a set
                     // of entries.
-                    xContainer = uno::Reference< container::XNameContainer >(
-                        xParentNameAccess, uno::UNO_QUERY );
+                    xContainer.set( xParentNameAccess, uno::UNO_QUERY );
                 }
                 else
                 {
@@ -915,9 +902,7 @@ bool HierarchyEntry::first( iterator& it )
                         >>= xNameAccess;
                 }
                 else
-                    xNameAccess
-                        = uno::Reference< container::XNameAccess >(
-                                xRootHierNameAccess, uno::UNO_QUERY );
+                    xNameAccess.set( xRootHierNameAccess, uno::UNO_QUERY );
 
                 OSL_ENSURE( xNameAccess.is(),
                             "HierarchyEntry::first - No name access!" );
@@ -1036,8 +1021,7 @@ HierarchyEntry::getRootReadAccess()
             try
             {
                 if ( !m_xConfigProvider.is() )
-                    m_xConfigProvider
-                        = uno::Reference< lang::XMultiServiceFactory >(
+                    m_xConfigProvider.set(
                             m_xContext->getServiceManager()->createInstanceWithContext(m_aServiceSpecifier, m_xContext),
                             uno::UNO_QUERY );
 
@@ -1053,8 +1037,7 @@ HierarchyEntry::getRootReadAccess()
 
                     m_bTriedToGetRootReadAccess = true;
 
-                    m_xRootReadAccess
-                        = uno::Reference< container::XHierarchicalNameAccess >(
+                    m_xRootReadAccess.set(
                             m_xConfigProvider->createInstanceWithArguments(
                                 READ_SERVICE_NAME,
                                 aArguments ),
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 217aaabb8e31..d3cdf8ff8cde 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -606,9 +606,7 @@ bool HierarchyDataSource::createConfigPath(
     {                                                           \
         osl::Guard< osl::Mutex > aGuard( m_aMutex );            \
         if ( !m_xCfg##member_name.is() )                        \
-            m_xCfg##member_name                                 \
-                = uno::Reference< interface_name >(             \
-                    m_xConfigAccess, uno::UNO_QUERY );          \
+            m_xCfg##member_name.set( m_xConfigAccess, uno::UNO_QUERY ); \
         xOrig = m_xCfg##member_name;                            \
     }
 
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index dd3e1bfe14b6..de1ada05fbbb 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -383,7 +383,7 @@ void HierarchyResultSetDataSupplier::releasePropertyValues( sal_uInt32 nIndex )
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     if ( nIndex < m_pImpl->m_aResults.size() )
-        m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+        m_pImpl->m_aResults[ nIndex ]->xRow.clear();
 }
 
 
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 241ea551348c..b63fd36ca35b 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -186,8 +186,7 @@ HierarchyContentProvider::getConfigProvider(
         try
         {
             ConfigProviderMapEntry aEntry;
-            aEntry.xConfigProvider
-                = uno::Reference< lang::XMultiServiceFactory >(
+            aEntry.xConfigProvider.set(
                                 m_xContext->getServiceManager()->createInstanceWithContext(rServiceSpecifier, m_xContext),
                                 uno::UNO_QUERY );
 
@@ -246,8 +245,7 @@ HierarchyContentProvider::getRootConfigReadNameAccess(
 
                     (*it).second.bTriedToGetRootReadAccess = true;
 
-                    (*it).second.xRootReadAccess
-                        = uno::Reference< container::XHierarchicalNameAccess >(
+                    (*it).second.xRootReadAccess.set(
                             xConfigProv->createInstanceWithArguments(
                                 "com.sun.star.ucb.HierarchyDataReadAccess",
                                 aArguments ),
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 0e79ffaa38d5..42da2162a4fc 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -891,8 +891,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
                 if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
                 {
-                    xAdditionalPropSet
-                        = uno::Reference< beans::XPropertySet >(
+                    xAdditionalPropSet.set(
                             rProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index fa02008bd1b3..32d893ac061b 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -432,7 +432,7 @@ void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     if ( nIndex < m_pImpl->m_aResults.size() )
-        m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+        m_pImpl->m_aResults[ nIndex ]->xRow.clear();
 }
 
 
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 5362c6fbefa3..3a0ed717b723 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -240,7 +240,7 @@ ContentProvider::createPackage( const PackageUri & rURI )
     uno::Reference< container::XHierarchicalNameAccess > xNameAccess;
     try
     {
-        xNameAccess = uno::Reference< container::XHierarchicalNameAccess >(
+        xNameAccess.set(
             m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
                 "com.sun.star.packages.comp.ZipPackage",
                 aArguments, m_xContext ),
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index b350f31c8c00..7b48aa015e96 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1005,8 +1005,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
                 if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
                 {
-                    xAdditionalPropSet
-                        = uno::Reference< beans::XPropertySet >(
+                    xAdditionalPropSet.set(
                             pProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index ecf725c00f32..0777123c83ba 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -378,7 +378,7 @@ void ResultSetDataSupplier::releasePropertyValues( sal_uInt32 nIndex )
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     if ( nIndex < m_pImpl->m_aResults.size() )
-        m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+        m_pImpl->m_aResults[ nIndex ]->xRow.clear();
 }
 
 // virtual
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index cef7495fb4f4..c896e834f410 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -115,10 +115,8 @@ DocumentContentFactory::createDocumentContent(
     uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac;
     try
     {
-        xDocFac
-            = uno::Reference< frame::XTransientDocumentsDocumentContentFactory >(
-                m_xSMgr->createInstance("com.sun.star.ucb.TransientDocumentsContentProvider"),
-                uno::UNO_QUERY );
+        xDocFac.set( m_xSMgr->createInstance("com.sun.star.ucb.TransientDocumentsContentProvider"),
+                     uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
     {
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 964fab071f33..f43bee85815f 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -73,9 +73,7 @@ StorageElementFactory::createTemporaryStorage()
 
     OSL_ENSURE( xStorageFac.is(), "Can't create storage factory!" );
     if ( xStorageFac.is() )
-        xStorage = uno::Reference< embed::XStorage >(
-                            xStorageFac->createInstance(),
-                            uno::UNO_QUERY );
+        xStorage.set( xStorageFac->createInstance(), uno::UNO_QUERY );
 
     if ( !xStorage.is() )
         throw uno::RuntimeException();
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 275f8c50c6d3..a2ce660093c3 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1177,8 +1177,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 // Process local Additional Properties.
                 if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
                 {
-                    xAdditionalPropSet
-                        = uno::Reference< beans::XPropertySet >(
+                    xAdditionalPropSet.set(
                             rProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
@@ -1999,8 +1998,7 @@ uno::Any Content::open(
             // Unreachable
         }
 
-        uno::Reference< io::XOutputStream > xOut
-            = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY );
+        uno::Reference< io::XOutputStream > xOut( rArg.Sink, uno::UNO_QUERY );
         if ( xOut.is() )
         {
             // PUSH: write data
@@ -2044,9 +2042,7 @@ uno::Any Content::open(
         }
         else
         {
-            uno::Reference< io::XActiveDataSink > xDataSink
-                = uno::Reference< io::XActiveDataSink >( rArg.Sink,
-                                                         uno::UNO_QUERY );
+            uno::Reference< io::XActiveDataSink > xDataSink( rArg.Sink, uno::UNO_QUERY );
             if ( xDataSink.is() )
             {
                 // PULL: wait for client read
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index dc86ddb2632a..321374925628 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -319,7 +319,7 @@ void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     if (nIndex < m_pImpl->m_Results.size())
-        m_pImpl->m_Results[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+        m_pImpl->m_Results[ nIndex ]->xRow.clear();
 }
 
 
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 469e53611237..9dbfd921721f 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1283,8 +1283,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 // Process local Additional Properties.
                 if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() )
                 {
-                    xAdditionalPropSet
-                        = uno::Reference< beans::XPropertySet >(
+                    xAdditionalPropSet.set(
                             rProvider->getAdditionalPropertySet( rContentId,
                                                                  false ),
                             uno::UNO_QUERY );
@@ -2141,8 +2140,7 @@ uno::Any Content::open(
             // Unreachable
         }
 
-        uno::Reference< io::XOutputStream > xOut
-            = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY );
+        uno::Reference< io::XOutputStream > xOut( rArg.Sink, uno::UNO_QUERY );
         if ( xOut.is() )
         {
             // PUSH: write data
@@ -2185,9 +2183,7 @@ uno::Any Content::open(
         }
         else
         {
-            uno::Reference< io::XActiveDataSink > xDataSink
-                = uno::Reference< io::XActiveDataSink >( rArg.Sink,
-                                                         uno::UNO_QUERY );
+            uno::Reference< io::XActiveDataSink > xDataSink( rArg.Sink, uno::UNO_QUERY );
             if ( xDataSink.is() )
             {
                 // PULL: wait for client read
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index 3fa7d86949ed..c2ad2a1cbd61 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -315,7 +315,7 @@ void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
     osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     if ( nIndex < m_pImpl->m_aResults.size() )
-        m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
+        m_pImpl->m_aResults[ nIndex ]->xRow.clear();
 }