From f177ab81ced99975851897df389ce62d6e91adf4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 5 Nov 2014 10:27:34 +0000
Subject: coverity#1215393 Uncaught exception

Change-Id: I96575d843fd982866c89000bb4426bd5e11c56d1
---
 svx/workben/pixelctl.cxx | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'svx')

diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx
index 37e106e380d9..f9620425060d 100644
--- a/svx/workben/pixelctl.cxx
+++ b/svx/workben/pixelctl.cxx
@@ -46,20 +46,28 @@ void Main();
 
 SAL_IMPLEMENT_MAIN()
 {
-    tools::extendApplicationEnvironment();
-
-    // create the global service-manager
-    Reference< XComponentContext > xContext = defaultBootstrap_InitialComponentContext();
-    Reference< XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), UNO_QUERY );
-
-    if( !xServiceManager.is() )
-        Application::Abort( "Failed to bootstrap" );
-
-    comphelper::setProcessServiceFactory( xServiceManager );
-
-    InitVCL();
-    ::Main();
-    DeInitVCL();
+    try
+    {
+        tools::extendApplicationEnvironment();
+
+        // create the global service-manager
+        Reference< XComponentContext > xContext = defaultBootstrap_InitialComponentContext();
+        Reference< XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), UNO_QUERY );
+
+        if( !xServiceManager.is() )
+            Application::Abort( "Failed to bootstrap" );
+
+        comphelper::setProcessServiceFactory( xServiceManager );
+
+        InitVCL();
+        ::Main();
+        DeInitVCL();
+    }
+    catch (const Exception& e)
+    {
+        SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+        return 1;
+    }
 
     return 0;
 }
-- 
cgit