diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-16 09:42:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-17 12:08:07 +0200 |
| commit | 9951d41460aa0b7fe24375a9e1eced87106c29b3 (patch) | |
| tree | 9146c8656f01ce07518e6e59da83c2b054f4e286 /desktop | |
| parent | 68e74bdf63e992666016c790e8e4cfd5b28d6abe (diff) | |
[API CHANGE] remove OSL_SIGNAL_USER_RESOURCEFAILURE
which is unused since
commit 00657aef09d854c74fb426a935a3e8b1fc390bb0
Date: Sun Jun 11 20:56:30 2017 +0100
migrate to boost::gettext
Change-Id: Ia66a3a729dc4999c95b96ae1754b07c372121370
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100810
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c3baa5392817..8c020c486798 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1147,37 +1147,23 @@ void Desktop::Exception(ExceptionCategory nCategory) FlushConfiguration(); - switch( nCategory ) - { - case ExceptionCategory::ResourceNotLoaded: - { - Application::Abort( "OS threw signal OSL_SIGNAL_USER_RESOURCEFAILURE" ); - break; - } - - default: - { - m_xLockfile.reset(); + m_xLockfile.reset(); - if( bRestart ) - { - RequestHandler::Disable(); - if( pSignalHandler ) - osl_removeSignalHandler( pSignalHandler ); - - restartOnMac(false); - if ( m_rSplashScreen.is() ) - m_rSplashScreen->reset(); + if( bRestart ) + { + RequestHandler::Disable(); + if( pSignalHandler ) + osl_removeSignalHandler( pSignalHandler ); - _exit( EXITHELPER_CRASH_WITH_RESTART ); - } - else - { - Application::Abort( OUString() ); - } + restartOnMac(false); + if ( m_rSplashScreen.is() ) + m_rSplashScreen->reset(); - break; - } + _exit( EXITHELPER_CRASH_WITH_RESTART ); + } + else + { + Application::Abort( OUString() ); } OSL_ASSERT(false); // unreachable |