mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant variable

Browse Source 
Change-Id: I062ea13827d7d9744b0965b305877633485015fa
Reviewed-on: https://gerrit.libreoffice.org/48405
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Mike Kaganski
2018-01-23 13:06:29 +01:00
parent 77a535285f
commit 6fc9d4a482
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/source/app/app.cxx
View File

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