Kaydet (Commit) 5e971b27 authored tarafından Chris Sherlock's avatar Chris Sherlock

vcl: rename EXC_* constants to EXCEPTION_*, EXC is too much like 'execute'

Change-Id: I2f79e0419b27391cc9bdc45576e67eecdbc9efa4
üst 249e3d6d
......@@ -623,9 +623,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
USHORT DemoApp::Exception( USHORT nError )
{
switch( nError & EXC_MAJORTYPE )
switch( nError & EXCEPTION_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
case EXCEPTION_RESOURCENOTLOADED:
Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
break;
}
......
......@@ -1207,7 +1207,7 @@ void Desktop::Exception(sal_uInt16 nError)
bool bAllowRecoveryAndSessionManagement = (
( !rArgs.IsNoRestore() ) && // some use cases of office must work without recovery
( !rArgs.IsHeadless() ) &&
(( nError & EXC_MAJORTYPE ) != EXC_DISPLAY ) && // recovery can't work without UI ... but UI layer seems to be the reason for this crash
(( nError & EXCEPTION_MAJORTYPE ) != EXCEPTION_DISPLAY ) && // recovery can't work without UI ... but UI layer seems to be the reason for this crash
( Application::IsInExecute() ) // crashes during startup and shutdown should be ignored (they indicates a corrupt installation ...)
);
if ( bAllowRecoveryAndSessionManagement )
......@@ -1215,9 +1215,9 @@ void Desktop::Exception(sal_uInt16 nError)
FlushConfiguration();
switch( nError & EXC_MAJORTYPE )
switch( nError & EXCEPTION_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
case EXCEPTION_RESOURCENOTLOADED:
{
OUString aResExceptionString;
Application::Abort( aResExceptionString );
......
......@@ -20,11 +20,11 @@
#ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX
#define INCLUDED_VCL_EXCEPTIONTYPES_HXX
#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100)
#define EXC_SYSTEM ((sal_uInt16)0x0300)
#define EXC_DISPLAY ((sal_uInt16)0x0400)
#define EXC_MAJORTYPE ((sal_uInt16)0xFF00)
#define EXC_MINORTYPE ((sal_uInt16)0x00FF)
#define EXCEPTION_RESOURCENOTLOADED ((sal_uInt16)0x0100)
#define EXCEPTION_SYSTEM ((sal_uInt16)0x0300)
#define EXCEPTION_DISPLAY ((sal_uInt16)0x0400)
#define EXCEPTION_MAJORTYPE ((sal_uInt16)0xFF00)
#define EXCEPTION_MINORTYPE ((sal_uInt16)0x00FF)
#endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX
......
......@@ -483,9 +483,9 @@ void DemoWindow::Resize()
sal_uInt16 DemoApp::Exception( sal_uInt16 nError )
{
switch( nError & EXC_MAJORTYPE )
switch( nError & EXCEPTION_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
case EXCEPTION_RESOURCENOTLOADED:
Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
break;
}
......
......@@ -279,15 +279,15 @@ OUString Application::GetAppFileName()
void Application::Exception( sal_uInt16 nError )
{
switch ( nError & EXC_MAJORTYPE )
switch ( nError & EXCEPTION_MAJORTYPE )
{
// System has precedence (so do nothing)
case EXC_SYSTEM:
case EXC_DISPLAY:
case EXCEPTION_SYSTEM:
case EXCEPTION_DISPLAY:
break;
#ifdef DBG_UTIL
case EXC_RSCNOTLOADED:
case EXCEPTION_RESOURCENOTLOADED:
Abort("Resource not loaded");
break;
default:
......
......@@ -107,7 +107,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
(pInfo->Signal == osl_Signal_FloatDivideByZero) ||
(pInfo->Signal == osl_Signal_DebugBreak) )
{
nVCLException = EXC_SYSTEM;
nVCLException = EXCEPTION_SYSTEM;
if (OpenGLZone::isInZone())
OpenGLZone::hardDisable();
}
......@@ -115,12 +115,12 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
// RC
if ((pInfo->Signal == osl_Signal_User) &&
(pInfo->UserSignal == OSL_SIGNAL_USER_RESOURCEFAILURE) )
nVCLException = EXC_RSCNOTLOADED;
nVCLException = EXCEPTION_RESOURCENOTLOADED;
// DISPLAY-Unix
if ((pInfo->Signal == osl_Signal_User) &&
(pInfo->UserSignal == OSL_SIGNAL_USER_X11SUBSYSTEMERROR) )
nVCLException = EXC_DISPLAY;
nVCLException = EXCEPTION_DISPLAY;
if ( nVCLException )
{
......
......@@ -832,9 +832,9 @@ void TestWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
void GrindApp::Exception( sal_uInt16 nError )
{
switch( nError & EXC_MAJORTYPE )
switch( nError & EXCEPTION_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
case EXCEPTION_RESOURCENOTLOADED:
Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment