diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-17 18:41:10 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-18 10:44:30 +0200 |
| commit | c51aeb9847eb6a0c0eddc4778ab80f1d1758791f (patch) | |
| tree | c68ae6d8d820785b00341ae3cbde6a5a99852710 | |
| parent | 946ac247c2cf02f48b6a8009064e0763fd9e97af (diff) | |
jsdialogs: avoid exception crashing app on events
Change-Id: I83ddb44f54061d9f585eef3864415a472151976a
Reviewed-on: https://gerrit.libreoffice.org/80989
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit dfabe21ac98d22150b23fbb973ef3d77ea839061)
Reviewed-on: https://gerrit.libreoffice.org/81012
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | desktop/source/lib/init.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index a0d10c2cb609..3d43fe6e82fe 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3297,10 +3297,13 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin else { OUString sAction("CLICK"); - WindowUIObject aUIObject(pWindow); - std::unique_ptr<UIObject> pUIWindow(aUIObject.get_child(sId)); - if (pUIWindow) - pUIWindow->execute(sAction, StringMap()); + try + { + WindowUIObject aUIObject(pWindow); + std::unique_ptr<UIObject> pUIWindow(aUIObject.get_child(sId)); + if (pUIWindow) + pUIWindow->execute(sAction, StringMap()); + } catch(...) {} // force resend pWindow->Resize(); |