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

Check for enable safe mode earlier

Browse Source 
Change-Id: I50e48472bb840c70e9a7c11dd84f33c64d6e1422
This commit is contained in:
Samuel Mehrbrodt
2016-10-20 12:47:40 +02:00
parent f0006e79c4
commit 11f6c6d591
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,6 +556,11 @@ void Desktop::Init()
SetBootstrapError( BE_UNO_SERVICEMANAGER, e.Message ); SetBootstrapError( BE_UNO_SERVICEMANAGER, e.Message );
} }
// Check whether safe mode is enabled
CommandLineArgs& rCmdLine = GetCommandLineArgs();
if (rCmdLine.IsSafeMode() || sfx2::SafeMode::hasFlag())
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
// gets read (langselect::prepareLocale() by UNO API -> Components::Components) // gets read (langselect::prepareLocale() by UNO API -> Components::Components)
// This may prepare SafeMode or restore from it by moving data in // This may prepare SafeMode or restore from it by moving data in

3
desktop/source/app/appinit.cxx
View File

@@ -97,9 +97,6 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context)
// interpret command line arguments // interpret command line arguments
CommandLineArgs& rCmdLine = GetCommandLineArgs(); CommandLineArgs& rCmdLine = GetCommandLineArgs();
if (rCmdLine.IsSafeMode() || sfx2::SafeMode::hasFlag())
Application::EnableSafeMode();
// Headless mode for FAT Office, auto cancels any dialogs that popup // Headless mode for FAT Office, auto cancels any dialogs that popup
if (rCmdLine.IsEventTesting()) if (rCmdLine.IsEventTesting())
Application::EnableEventTestingMode(); Application::EnableEventTestingMode();