[Libreoffice-commits] core.git: desktop/source

[Mike Kaganski]

 desktop/source/app/app.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 6fc9d4a482ab50a1bf8fefb1dae2a6ded3c7e3dd
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Jan 23 13:06:29 2018 +0100

    Remove redundant variable
    
    Change-Id: I062ea13827d7d9744b0965b305877633485015fa
    Reviewed-on: https://gerrit.libreoffice.org/48405
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c95674d50211..da71a0aae2b7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -473,11 +473,11 @@ void Desktop::Init()
     }
 
     // Check whether safe mode is enabled
-    CommandLineArgs& rCmdLine = GetCommandLineArgs();
+    const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
     // Check if we are restarting from safe mode - in that case we don't want to enter it again
     if (sfx2::SafeMode::hasRestartFlag())
         sfx2::SafeMode::removeRestartFlag();
-    else if (rCmdLine.IsSafeMode() || sfx2::SafeMode::hasFlag())
+    else if (rCmdLineArgs.IsSafeMode() || sfx2::SafeMode::hasFlag())
         Application::EnableSafeMode();
 
     // When we are in SafeMode we need to do changes before the configuration
@@ -514,8 +514,6 @@ void Desktop::Init()
 
     if ( true )
     {
-        const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
-
         // start ipc thread only for non-remote offices
         RequestHandler::Status aStatus = RequestHandler::Enable(true);
         if ( aStatus == RequestHandler::IPC_STATUS_PIPE_ERROR )