diff options
| -rw-r--r-- | desktop/source/app/app.cxx | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index f1ec0b679bc0..5d76976569b3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -477,30 +477,27 @@ void Desktop::Init() // the UserConfiguration directory comphelper::BackupFileHelper::reactOnSafeMode(Application::IsSafeModeEnabled()); - if ( m_aBootstrapError == BE_OK ) + try { - try + if (!langselect::prepareLocale()) { - if (!langselect::prepareLocale()) - { - SetBootstrapError( BE_LANGUAGE_MISSING, OUString() ); - } - } - catch (css::uno::Exception & e) - { - SetBootstrapError( BE_OFFICECONFIG_BROKEN, e.Message ); + SetBootstrapError( BE_LANGUAGE_MISSING, OUString() ); } + } + catch (css::uno::Exception & e) + { + SetBootstrapError( BE_OFFICECONFIG_BROKEN, e.Message ); + } - // test code for ProfileSafeMode to allow testing the fail - // of loading the office configuration initially. To use, - // either set to true and compile, or set a breakpoint - // in debugger and change the local bool - static bool bTryHardOfficeconfigBroken(false); // loplugin:constvars:ignore + // test code for ProfileSafeMode to allow testing the fail + // of loading the office configuration initially. To use, + // either set to true and compile, or set a breakpoint + // in debugger and change the local bool + static bool bTryHardOfficeconfigBroken(false); // loplugin:constvars:ignore - if (bTryHardOfficeconfigBroken) - { - SetBootstrapError(BE_OFFICECONFIG_BROKEN, OUString()); - } + if (bTryHardOfficeconfigBroken) + { + SetBootstrapError(BE_OFFICECONFIG_BROKEN, OUString()); } // start ipc thread only for non-remote offices |