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

Change-Id: Ic979f8a7734d0ef7a915d47a875cdcd460c0cc58

6 files changed, 18 insertions, 19 deletions

diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index b409735f330e..20fb3104bf1b 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -201,7 +201,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
     // They call us back by using our c++ interface.
 
     m_xResultListener = xListener;
-    m_xSelfHold       = css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
+    m_xSelfHold.set(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
 
     aWriteLock.clear();
     // <- SAFE ----------------------------------
@@ -492,7 +492,7 @@ bool CloseDispatcher::implts_closeFrame()
 
     {
         SolarMutexGuard g;
-        m_xCloseFrame = css::uno::WeakReference< css::frame::XFrame >();
+        m_xCloseFrame.clear();
     }
 
     return true;
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 5dda8e56e9cf..2382c2ba1ea2 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -468,9 +468,9 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
             // create it
             try
             {
-                xHandler = css::uno::Reference< css::frame::XDispatchProvider >(
+                xHandler.set(
                     css::uno::Reference<css::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), css::uno::UNO_QUERY_THROW)
-                    ->createInstance(aHandler.m_sUNOName),
+                      ->createInstance(aHandler.m_sUNOName),
                     css::uno::UNO_QUERY);
             }
             catch(const css::uno::Exception&) {}
@@ -529,7 +529,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
 css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreateDispatchHelper( EDispatchHelper                                  eHelper     ,
                                                                                                  const css::uno::Reference< css::frame::XFrame >& xOwner      ,
                                                                                                  const OUString&                           sTarget     ,
-                                                                                                       sal_Int32                                  nSearchFlags)
+                                                                                                 sal_Int32                                  nSearchFlags)
 {
     css::uno::Reference< css::frame::XDispatch > xDispatchHelper;
 
@@ -543,7 +543,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
                     if ( ! m_xMenuDispatcher.is() )
                     {
                         MenuDispatcher* pDispatcher = new MenuDispatcher( m_xContext, xOwner );
-                        m_xMenuDispatcher = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                        m_xMenuDispatcher.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                     }
                     xDispatchHelper = m_xMenuDispatcher;
                 }
@@ -552,7 +552,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
         case E_CREATEDISPATCHER :
                 {
                     LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, sTarget, nSearchFlags);
-                    xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                    xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
 
@@ -562,7 +562,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
                     if (xDesktop.is())
                     {
                         LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, SPECIALTARGET_BLANK, 0);
-                        xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                        xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                     }
                 }
                 break;
@@ -573,7 +573,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
                     if (xDesktop.is())
                     {
                         LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, SPECIALTARGET_DEFAULT, 0);
-                        xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                        xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                     }
                 }
                 break;
@@ -581,21 +581,21 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
         case E_SELFDISPATCHER :
                 {
                     LoadDispatcher* pDispatcher = new LoadDispatcher(m_xContext, xOwner, SPECIALTARGET_SELF, 0);
-                    xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                    xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
 
         case E_CLOSEDISPATCHER :
                 {
                     CloseDispatcher* pDispatcher = new CloseDispatcher( m_xContext, xOwner, sTarget );
-                    xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                    xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
 
         case E_STARTMODULEDISPATCHER :
                 {
                     StartModuleDispatcher* pDispatcher = new StartModuleDispatcher( m_xContext, xOwner );
-                    xDispatchHelper = css::uno::Reference< css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
+                    xDispatchHelper.set( static_cast< ::cppu::OWeakObject* >(pDispatcher), css::uno::UNO_QUERY );
                 }
                 break;
     }
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 44124da8237c..ad707f3a6aaf 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -106,7 +106,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
     // If no list exist register these interceptor for all dispatch events with "*"!
     InterceptorInfo aInfo;
 
-    aInfo.xInterceptor = css::uno::Reference< css::frame::XDispatchProvider >(xInterceptor, css::uno::UNO_QUERY);
+    aInfo.xInterceptor.set(xInterceptor, css::uno::UNO_QUERY);
     css::uno::Reference< css::frame::XInterceptorInfo > xInfo(xInterceptor, css::uno::UNO_QUERY);
     if (xInfo.is())
         aInfo.lURLPattern = xInfo->getInterceptedURLs();
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index e342560fa169..7c34d436b8aa 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -184,7 +184,7 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
         }
 
         // Forget our factory.
-        m_xContext = uno::Reference< XComponentContext >();
+        m_xContext.clear();
 
         // Remove our menu from system window if it is still there!
         if ( m_pMenuManager )
@@ -251,7 +251,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource
                     uno::Reference< XController >   xController( xFrame->getController(), UNO_QUERY );
 
                     if ( xController.is() )
-                        xModel = uno::Reference< XModel >( xController->getModel(), UNO_QUERY );
+                        xModel.set( xController->getModel(), UNO_QUERY );
 
                     // retrieve addon popup menus and add them to our menu bar
                     AddonMenuManager::MergeAddonPopupMenus( xFrame, nPos, pMenuBar, m_xContext );
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 9839fd5933f8..bd19c85e3e4d 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -69,7 +69,7 @@ Oxt_Handler::~Oxt_Handler()
         css::frame::DispatchResultEvent aEvent;
         aEvent.State = css::frame::DispatchResultState::FAILURE;
         m_xListener->dispatchFinished( aEvent );
-        m_xListener = css::uno::Reference< css::frame::XDispatchResultListener >();
+        m_xListener.clear();
     }
 }
 
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 7e7b569ad194..0db118cf1073 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -297,7 +297,7 @@ void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( Runtim
         }
 
         // Forget our factory.
-        m_xContext = uno::Reference< XComponentContext >();
+        m_xContext.clear();
     }
 }
 
@@ -323,8 +323,7 @@ void PopupMenuDispatcher::impl_RetrievePopupControllerQuery()
                         OUString aMenuBar( "private:resource/menubar/menubar" );
                         xMenuBar = xLayoutManager->getElement( aMenuBar );
 
-                        m_xPopupCtrlQuery = css::uno::Reference< css::container::XNameAccess >(
-                                                xMenuBar, css::uno::UNO_QUERY );
+                        m_xPopupCtrlQuery.set( xMenuBar, css::uno::UNO_QUERY );
                     }
                 }
                 catch ( const css::uno::RuntimeException& )