From 5e4dc857252c8eeaaa629af2fb6b392ab02036cf Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 19 Jan 2015 12:36:21 +0100
Subject: svx: ExternalToolEdit: don't terminate if SystemShellExecute throws

Change-Id: Ia527a2c9467e2ab097cf688164f4176a52fa1d36
---
 svx/source/core/extedit.cxx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'svx')

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index b49125332b29..6f6dc2c63afa 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -87,9 +87,17 @@ public:
 
 void ExternalToolEditThread::execute()
 {
-    Reference<XSystemShellExecute> xSystemShellExecute(
-        SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
-    xSystemShellExecute->execute(m_aFileName, OUString(), SystemShellExecuteFlags::URIS_ONLY);
+    try
+    {
+        Reference<XSystemShellExecute> const xSystemShellExecute(
+            SystemShellExecute::create( ::comphelper::getProcessComponentContext()));
+        xSystemShellExecute->execute(m_aFileName, OUString(),
+                SystemShellExecuteFlags::URIS_ONLY);
+    }
+    catch (uno::Exception const& e)
+    {
+        SAL_WARN("svx", "ExternalToolEditThread: exception: " << e.Message);
+    }
 }
 
 void ExternalToolEdit::Edit(GraphicObject const*const pGraphicObject)
-- 
cgit v1.2.3