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

Change-Id: I2b592fd3327f4bbe4685e84711dc9d6f19222a97

19 files changed, 32 insertions, 37 deletions

diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx
index a5371e2c3654..4a176b906cd8 100644
--- a/sc/qa/extras/scnamedrangesobj.cxx
+++ b/sc/qa/extras/scnamedrangesobj.cxx
@@ -66,7 +66,7 @@ uno::Reference< uno::XInterface > ScNamedRangesObj::init(sal_Int32 nSheet)
     //set value from xnamedranges.hxx
     uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW);
     uno::Reference< container::XIndexAccess > xIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW);
-    xSheet = uno::Reference< sheet::XSpreadsheet >(xIndexAccess->getByIndex(nSheet),UNO_QUERY_THROW);
+    xSheet.set(xIndexAccess->getByIndex(nSheet),UNO_QUERY_THROW);
 
     return xNamedRanges;
 }
diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx
index a71192c462b1..570b95765696 100644
--- a/sc/qa/extras/sctablesheetsobj.cxx
+++ b/sc/qa/extras/sctablesheetsobj.cxx
@@ -84,7 +84,7 @@ uno::Reference< uno::XInterface > ScTableSheetsObj::init()
     if(!mxComponent.is())
         mxComponent = loadFromDesktop(aFileURL);
     CPPUNIT_ASSERT(mxComponent.is());
-    xDocument = uno::Reference< sheet::XSpreadsheetDocument >(mxComponent, UNO_QUERY_THROW);
+    xDocument.set(mxComponent, UNO_QUERY_THROW);
     uno::Reference< uno::XInterface > xReturn( xDocument->getSheets(), UNO_QUERY_THROW);
 
     return xReturn;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 50fc32d3f868..0c52b11221e5 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1898,7 +1898,7 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb
     {
         uno::Reference<uno::XInterface> xIntDim = ScUnoHelpFunctions::AnyToInterface(
                                     xIntDims->getByIndex(rElemDesc.Dimension) );
-        xDim = uno::Reference<container::XNamed>( xIntDim, uno::UNO_QUERY );
+        xDim.set( xIntDim, uno::UNO_QUERY );
     }
     OSL_ENSURE( xDim.is(), "dimension not found" );
     if ( !xDim.is() ) return;
@@ -2776,7 +2776,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS
                 pArray[3] <<= OUString( rDesc.aParPass );
                 xInit->initialize( aSeq );
             }
-            xRet = uno::Reference<sheet::XDimensionsSupplier>( xInterface, uno::UNO_QUERY );
+            xRet.set( xInterface, uno::UNO_QUERY );
         }
         catch(uno::Exception&)
         {
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 48f060f956f7..506b276d2a2d 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -1546,7 +1546,7 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes )
                 uno::Reference<uno::XInterface> xInterface;
                 rNewRes >>= xInterface;
                 if ( xInterface.is() )
-                    xVarRes = uno::Reference<sheet::XVolatileResult>( xInterface, uno::UNO_QUERY );
+                    xVarRes.set( xInterface, uno::UNO_QUERY );
 
                 if (!xVarRes.is())
                     nErrCode = errNoValue;          // unknown interface
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index f36309bf24ba..20d5530647c9 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -28,8 +28,7 @@ static rtl::Reference<ConfigurationListener> getMiscListener()
 {
     static rtl::Reference<ConfigurationListener> xListener;
     if (!xListener.is())
-        xListener = rtl::Reference<ConfigurationListener>(
-            new ConfigurationListener("/org.openoffice.Office.Common/Misc"));
+        xListener.set(new ConfigurationListener("/org.openoffice.Office.Common/Misc"));
     return xListener;
 }
 
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 8d28ef2ba354..527ff99f8f6d 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -574,7 +574,7 @@ bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, voi
                     bRet = true;
 
                     xWorkStore->dispose();
-                    xWorkStore = uno::Reference < embed::XStorage >();
+                    xWorkStore.clear();
                     rxOStm->Commit();
                 }
                 catch ( uno::Exception& )
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 15ac5ad51f87..b539596c26ba 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -467,7 +467,7 @@ bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* p
                 bRet = true;
 
                 xWorkStore->dispose();
-                xWorkStore = uno::Reference < embed::XStorage >();
+                xWorkStore.clear();
                 rxOStm->Commit();
             }
             break;
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 08499ef62a30..ce439e6debe0 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -195,8 +195,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         //  only text (title is still needed, for the cancel button)
         ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 );
 
-        uno::Reference<sdbc::XRowSet> xRowSet = uno::Reference<sdbc::XRowSet>(
-                xResultSet, uno::UNO_QUERY );
+        uno::Reference<sdbc::XRowSet> xRowSet( xResultSet, uno::UNO_QUERY );
         bool bDispose = false;
         if ( !xRowSet.is() )
         {
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 1fb50a91877c..9e08c74498c1 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -97,7 +97,7 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& )
 
         if( pObject && dynamic_cast<const SdrOle2Obj*>( pObject) !=  nullptr )
         {
-            Reference< drawing::XShape > xSourceDoc = Reference< drawing::XShape >( pObject->getUnoShape(), UNO_QUERY_THROW );
+            Reference< drawing::XShape > xSourceDoc( pObject->getUnoShape(), UNO_QUERY_THROW );
             GraphicHelper::SaveShapeAsGraphic( xSourceDoc );
         }
     }
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index e536e19d3e9e..c7e87878f209 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -99,7 +99,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
     osl_atomic_increment( &m_refCount );
 
     {
-        mxShapeAgg = uno::Reference<uno::XAggregation>( xShape, uno::UNO_QUERY );
+        mxShapeAgg.set( xShape, uno::UNO_QUERY );
         // extra block to force deletion of the temporary before setDelegator
     }
 
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 594d7ded6bea..2816d85cf36f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -274,7 +274,7 @@ namespace basprov
             m_pAppBasicManager = SfxApplication::GetBasicManager();
 
         if ( !m_xLibContainerApp.is() )
-            m_xLibContainerApp = Reference< script::XLibraryContainer >( SfxGetpApp()->GetBasicContainer(), UNO_QUERY );
+            m_xLibContainerApp.set( SfxGetpApp()->GetBasicContainer(), UNO_QUERY );
     }
 
 
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 1eb20b76b4c5..55666eea9461 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -111,7 +111,7 @@ namespace dlgprov
         if ( xSMgr.is() )
         {
             args[0] <<= xModel;
-            mxListener = Reference< XScriptListener >( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY );
+            mxListener.set( xSMgr->createInstanceWithArgumentsAndContext( "ooo.vba.EventListener", args, m_xContext ), UNO_QUERY );
         }
         if ( rxControl.is() )
         {
@@ -315,7 +315,7 @@ namespace dlgprov
 
                 for ( sal_Int32 i2 = 0; i2 < nControlCount; ++i2 )
                 {
-                    pObjects2[i2] = Reference< XInterface >( pControls[i2], UNO_QUERY );
+                    pObjects2[i2].set( pControls[i2], UNO_QUERY );
                 }
                 nestedAttachEvents( aObjects, Helper, sDialogCodeName );
             }
@@ -341,7 +341,7 @@ namespace dlgprov
                 Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
                 if ( xSMgr.is() )
                 {
-                    m_xEventAttacher = Reference< XEventAttacher >( xSMgr->createInstanceWithContext(
+                    m_xEventAttacher.set( xSMgr->createInstanceWithContext(
                         "com.sun.star.script.EventAttacher", m_xContext ), UNO_QUERY );
 
                     if ( !m_xEventAttacher.is() )
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 1d51a3ae3fbc..545188613e94 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -284,7 +284,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
         Reference< uri::XUriReference > uriRef;
         for (;;)
         {
-            uriRef = Reference< uri::XUriReference >( xFac->parse( aURL ), UNO_QUERY );
+            uriRef.set( xFac->parse( aURL ), UNO_QUERY );
             if ( !uriRef.is() )
             {
                 OUString errorMsg("DialogProviderImpl::getDialogModel: failed to parse URI: ");
@@ -334,7 +334,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
 
             if ( sLocation == "application" )
             {
-                xLibContainer = Reference< XLibraryContainer >( SfxGetpApp()->GetDialogContainer(), UNO_QUERY );
+                xLibContainer.set( SfxGetpApp()->GetDialogContainer(), UNO_QUERY );
             }
             else if ( sLocation == "document" )
             {
@@ -447,7 +447,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
 
             Reference< container::XNameContainer > xDialogModel( createDialogModel( xInput , xStringResourceManager, aDialogSourceURLAny  ), UNO_QUERY_THROW);
 
-            xCtrlModel = Reference< XControlModel >( xDialogModel, UNO_QUERY );
+            xCtrlModel.set( xDialogModel, UNO_QUERY );
         }
         return xCtrlModel;
     }
@@ -485,7 +485,7 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
                 {
                     Reference< frame::XFrame > xFrame( xController->getFrame(), UNO_QUERY );
                     if ( xFrame.is() )
-                        xPeer = Reference< XWindowPeer>( xFrame->getContainerWindow(), UNO_QUERY );
+                        xPeer.set( xFrame->getContainerWindow(), UNO_QUERY );
                 }
             }
 
@@ -519,11 +519,11 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
                 Reference< XInterface >* pObjects = aObjects.getArray();
                 for ( sal_Int32 i = 0; i < nControlCount; ++i )
                 {
-                    pObjects[i] = Reference<XInterface>( pControls[i], UNO_QUERY );
+                    pObjects[i].set( pControls[i], UNO_QUERY );
                 }
 
                 // also add the dialog control itself to the sequence
-                pObjects[nControlCount] = Reference<XInterface>( rxControl, UNO_QUERY );
+                pObjects[nControlCount].set( rxControl, UNO_QUERY );
 
                 Reference< XScriptEventsAttacher > xScriptEventsAttacher = new DialogEventsAttacherImpl
                     ( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess,
@@ -684,10 +684,9 @@ static const char aResourceResolverPropName[] = "ResourceResolver";
                 }
             }
 
-            xCtrl = Reference< XControl >( createDialogControl( xCtrlMod, xParent ) );
+            xCtrl.set( createDialogControl( xCtrlMod, xParent ) );
             if ( xCtrl.is() )
             {
-                //xDialog = Reference< XDialog >( xCtrl, UNO_QUERY );
                 Reference< XIntrospectionAccess > xIntrospectionAccess = inspectHandler( xHandler );
                 attachControlEvents( xCtrl, xHandler, xIntrospectionAccess, bDialogProviderMode );
             }
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 1f5ef05a3d1b..32792d7b142a 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -420,8 +420,7 @@ void ScriptProtocolHandler::createScriptProvider()
             Any aContext;
             if ( getScriptInvocation() )
                 aContext = makeAny( m_xScriptInvocation );
-            m_xScriptProvider = Reference< provider::XScriptProvider > (
-                xFac->createScriptProvider( aContext ), UNO_QUERY_THROW );
+            m_xScriptProvider.set( xFac->createScriptProvider( aContext ), UNO_QUERY_THROW );
         }
     }
     catch ( const RuntimeException & e )
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 74a6abfe5d6f..75072a244a3c 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -308,8 +308,8 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference<
     {
         xFac = provider::theMasterScriptProviderFactory::get( xCtx );
 
-        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( OUString("user") ) ), UNO_QUERY_THROW );
-        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >( xFac->createScriptProvider( makeAny( OUString("share") ) ), UNO_QUERY_THROW );
+        locnBNs[ mspIndex++ ].set( xFac->createScriptProvider( makeAny( OUString("user") ) ), UNO_QUERY_THROW );
+        locnBNs[ mspIndex++ ].set( xFac->createScriptProvider( makeAny( OUString("share") ) ), UNO_QUERY_THROW );
     }
     // TODO proper exception handling, should throw
     catch( const Exception& e )
@@ -339,8 +339,7 @@ Sequence< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference<
                 {
                     Reference< document::XEmbeddedScripts > xScripts( model, UNO_QUERY );
                     if ( xScripts.is() )
-                        locnBNs[ mspIndex++ ] = Reference< browse::XBrowseNode >(
-                            xFac->createScriptProvider( makeAny( model ) ), UNO_QUERY_THROW );
+                        locnBNs[ mspIndex++ ].set( xFac->createScriptProvider( makeAny( model ) ), UNO_QUERY_THROW );
                 }
             }
         }
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index b1934e01354c..1b6fea093de0 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -436,12 +436,12 @@ MasterScriptProvider::getChildNodes()
     sal_Int32 provIndex = 0;
     for ( ; provIndex < providers.getLength(); provIndex++ )
     {
-        children[ provIndex ] = Reference< browse::XBrowseNode >( providers[ provIndex ], UNO_QUERY );
+        children[ provIndex ].set( providers[ provIndex ], UNO_QUERY );
     }
 
     if ( hasPkgs  )
     {
-        children[ provIndex ] = Reference< browse::XBrowseNode >( pkgProv, UNO_QUERY );
+        children[ provIndex ].set( pkgProv, UNO_QUERY );
 
     }
 
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index 6a133e15de6b..854b8235163f 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -140,7 +140,7 @@ ProviderCache::populateCache() throw ( RuntimeException )
     {
         OUString languageProviderName( "com.sun.star.script.provider.LanguageScriptProvider"  );
 
-        Reference< container::XContentEnumerationAccess > xEnumAccess = Reference< container::XContentEnumerationAccess >( m_xMgr, UNO_QUERY_THROW );
+        Reference< container::XContentEnumerationAccess > xEnumAccess( m_xMgr, UNO_QUERY_THROW );
         Reference< container::XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
 
         while ( xEnum->hasMoreElements() )
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 95ac7bedf04d..11ef0be74de7 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1277,7 +1277,7 @@ BinaryOutput::BinaryOutput( Reference< XMultiComponentFactory > xMCF,
         , m_xContext( xContext )
 {
     m_xTempFile = io::TempFile::create( m_xContext );
-    m_xOutputStream = Reference< io::XOutputStream >( m_xTempFile, UNO_QUERY_THROW );
+    m_xOutputStream.set( m_xTempFile, UNO_QUERY_THROW );
 }
 
 template< class T >
@@ -1510,7 +1510,7 @@ Reference< io::XInputStream > BinaryInput::getInputStreamForSection( sal_Int32 n
         if( xSeekable.is() )
             xSeekable->seek( 0 );
 
-        xIn = Reference< io::XInputStream>( xTempOut, UNO_QUERY );
+        xIn.set( xTempOut, UNO_QUERY );
     }
     else
         OSL_FAIL( "BinaryInput::getInputStreamForSection(): Read past end" );
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index ac6a5c06b4e8..0f8f582a3e6b 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -604,7 +604,7 @@ public:
                     xCloseBroadcaster->removeCloseListener( this );
                 }
                 // Add the listener into the new XCloseBroadcaster.
-                xCloseBroadcaster = uno::Reference< util::XCloseBroadcaster >( xModel, uno::UNO_QUERY );
+                xCloseBroadcaster.set( xModel, uno::UNO_QUERY );
                 if (xCloseBroadcaster.is())
                 {
                     xCloseBroadcaster->addCloseListener( this );