summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-16 09:42:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-17 12:08:07 +0200
commit9951d41460aa0b7fe24375a9e1eced87106c29b3 (patch)
tree9146c8656f01ce07518e6e59da83c2b054f4e286
parent68e74bdf63e992666016c790e8e4cfd5b28d6abe (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>
-rw-r--r--canvas/workben/canvasdemo.cxx10
-rw-r--r--desktop/source/app/app.cxx42
-rw-r--r--include/osl/signal.h1
-rw-r--r--include/vcl/exceptiontypes.hxx2
-rw-r--r--vcl/source/app/svapp.cxx10
-rw-r--r--vcl/source/app/svmain.cxx5
6 files changed, 16 insertions, 54 deletions
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 603ec295ba0d..a1c5b58165fc 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -636,16 +636,8 @@ int DemoApp::Main()
return 0;
}
-void DemoApp::Exception( ExceptionCategory nCategory )
+void DemoApp::Exception( ExceptionCategory )
{
- switch( nCategory )
- {
- case ExceptionCategory::ResourceNotLoaded:
- Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
- break;
- default:
- break;
- }
}
void DemoApp::Init()
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
diff --git a/include/osl/signal.h b/include/osl/signal.h
index 4b7beadc295a..a467452bec10 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -31,7 +31,6 @@ extern "C" {
#define OSL_SIGNAL_USER_RESERVED 0
-#define OSL_SIGNAL_USER_RESOURCEFAILURE (OSL_SIGNAL_USER_RESERVED - 1)
#define OSL_SIGNAL_USER_X11SUBSYSTEMERROR (OSL_SIGNAL_USER_RESERVED - 2)
typedef void* oslSignalHandler;
diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx
index bde3f5f5f91d..83654d3705bb 100644
--- a/include/vcl/exceptiontypes.hxx
+++ b/include/vcl/exceptiontypes.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_EXCEPTIONTYPES_HXX
enum class ExceptionCategory {
- NONE, ResourceNotLoaded, System, UserInterface
+ NONE, System, UserInterface
};
#endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 80b92f34de5d..04f6f1670143 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -244,19 +244,9 @@ void Application::Exception( ExceptionCategory nCategory )
case ExceptionCategory::System:
case ExceptionCategory::UserInterface:
break;
-
-#ifdef DBG_UTIL
- case ExceptionCategory::ResourceNotLoaded:
- Abort("Resource not loaded");
- break;
default:
Abort("Unknown Error");
break;
-#else
- default:
- Abort(OUString());
- break;
-#endif
}
}
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 05d8ef9c34a6..2093f66a5ad7 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -145,11 +145,6 @@ static oslSignalAction VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo*
#endif
}
- // RC
- if ((pInfo->Signal == osl_Signal_User) &&
- (pInfo->UserSignal == OSL_SIGNAL_USER_RESOURCEFAILURE) )
- nVCLException = ExceptionCategory::ResourceNotLoaded;
-
// DISPLAY-Unix
if ((pInfo->Signal == osl_Signal_User) &&
(pInfo->UserSignal == OSL_SIGNAL_USER_X11SUBSYSTEMERROR) )