diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-19 12:36:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-19 12:29:29 +0000 |
| commit | b55ec68268f72eee291cef29731b59c8c83af361 (patch) | |
| tree | 119f883e6a05efe9891425bcc397ef12b312f2b4 /svx | |
| parent | ef490df2119523e1761f99b5fdbb387c2c71608d (diff) | |
svx: ExternalToolEdit: don't terminate if SystemShellExecute throws
(cherry picked from commit 5e4dc857252c8eeaaa629af2fb6b392ab02036cf)
Change-Id: Ia527a2c9467e2ab097cf688164f4176a52fa1d36
Reviewed-on: https://gerrit.libreoffice.org/13997
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/core/extedit.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index e32b163bad0a..1511fdf0b367 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 (Exception const& e) + { + SAL_WARN("svx", "ExternalToolEditThread: exception: " << e.Message); + } } void ExternalToolEdit::Edit(GraphicObject const*const pGraphicObject) |