diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-03-22 17:51:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-03-22 19:27:14 +0000 |
| commit | c3ec6ac5df2954b24010868f1d40bff242bd1742 (patch) | |
| tree | e1f993ca71b55b4baf57ba7758b3b750c8fcfa21 /desktop | |
| parent | feb8b04a0ee86b0146a17393da220ae188babda8 (diff) | |
m_aBootsrapError will always be BE_OK here now
...since a1faf14f74a62ea76141115538d7d30d90c9eeb6 "rhbz#2171265 Report fatal
InitApplicationServiceManager failures more reliably"
Change-Id: I36771aeb8d13f08558f323e713de5cbe3972b82e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149329
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -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 |