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 /desktop | |
| parent | 249e3d6d1927705aac81fa7f40fccc5c82be43d7 (diff) | |
vcl: rename EXC_* constants to EXCEPTION_*, EXC is too much like 'execute'
Change-Id: I2f79e0419b27391cc9bdc45576e67eecdbc9efa4
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 6d9b08ea3f5a..b7dcefb9876c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -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 ); |