diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-06 13:13:23 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-06 13:13:23 +1100 |
| commit | 5e971b274922f9713aefcd5f612459ffced84845 (patch) | |
| tree | aad062853f5840a89694b22df87de4e07a20b44f /vcl/source | |
| parent | 249e3d6d1927705aac81fa7f40fccc5c82be43d7 (diff) | |
vcl: rename EXC_* constants to EXCEPTION_*, EXC is too much like 'execute'
Change-Id: I2f79e0419b27391cc9bdc45576e67eecdbc9efa4
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 94e91022b4e2..675a84893fe2 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -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: diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 67345868be3f..eba0c10ded5b 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -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 ) { |