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

[Samuel Mehrbrodt]

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

New commits:
commit 277b55131319d483c2f855c82c4585dfa15e8c3f
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Oct 19 15:25:08 2016 +0200

    Use Application::IsSafeModeEnabled()
    
    Change-Id: I8ca8ceae76b6479a848a618ed141ce29a9c2d84e
    Reviewed-on: https://gerrit.libreoffice.org/30077
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6b29f92..c3bd15c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -558,12 +558,9 @@ void Desktop::Init()
 
     // When we are in SafeMode we need to do changes before the configuration
     // gets read (langselect::prepareLocale() by UNO API -> Components::Components)
-    const CommandLineArgs& rArgs = GetCommandLineArgs();
-    const bool bSafeMode(rArgs.IsSafeMode() || sfx2::SafeMode::hasFlag());
-
-    // this may prepare SafeMode or restore from it by moving data in
+    // This may prepare SafeMode or restore from it by moving data in
     // the UserConfiguration directory
-    comphelper::BackupFileHelper::reactOnSafeMode(bSafeMode);
+    comphelper::BackupFileHelper::reactOnSafeMode(Application::IsSafeModeEnabled());
 
     if ( m_aBootstrapError == BE_OK )
     {