[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source

[Herbert Dürr]

 desktop/source/app/app.cxx |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 0881e04dda51387318b7a91170fc485a69f98a05
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Aug 9 13:31:28 2013 +0000

    #i122991# provide some details about fatal exceptions in the desktop app
    
    In the desktop application the FatalError() facility provides a dialog
    with copy+pasteable text that helps to communicate details important for
    the understanding of such critical bugs.

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9eb1985..1b82e41 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2235,6 +2235,21 @@ void Desktop::Main()
             OfficeIPCThread::SetDowning();
             FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
         }
+        catch( const ::com::sun::star::uno::Exception& exUNO)
+        {
+            OfficeIPCThread::SetDowning();
+            FatalError( exUNO.Message);
+        }
+        catch( const std::exception& exSTD)
+        {
+            OfficeIPCThread::SetDowning();
+            FatalError( OUString::createFromAscii( exSTD.what()));
+        }
+        catch( ...)
+        {
+            OfficeIPCThread::SetDowning();
+            FatalError( OUString(RTL_CONSTASCII_USTRINGPARAM( "Caught Unknown Exception: Aborting!")));
+        }
     }
     // CAUTION: you do not necessarily get here e.g. on the Mac.
     // please put all deinitialization code into doShutdown