summaryrefslogtreecommitdiff
path: root/desktop/source/app/app.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/app/app.cxx')
-rw-r--r--desktop/source/app/app.cxx42
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