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

Change-Id: I2f79e0419b27391cc9bdc45576e67eecdbc9efa4

7 files changed, 21 insertions, 21 deletions

diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index fc06f103b094..4a8143c23a87 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -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;
     }
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 );
diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx
index 92df26636b7a..bdf044a47edd 100644
--- a/include/vcl/exceptiontypes.hxx
+++ b/include/vcl/exceptiontypes.hxx
@@ -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
 
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 9b4dc810beb7..17560f8bc5ea 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -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;
     }
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 )
         {
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index a1f074ae6eb6..03e2af70377e 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -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;
     }