desktop/source/lib/init.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit c51aeb9847eb6a0c0eddc4778ab80f1d1758791f Author: Szymon Kłos <[email protected]> AuthorDate: Thu Oct 17 18:41:10 2019 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Fri Oct 18 10:44:30 2019 +0200 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 <[email protected]> (cherry picked from commit dfabe21ac98d22150b23fbb973ef3d77ea839061) Reviewed-on: https://gerrit.libreoffice.org/81012 Tested-by: Jenkins CollaboraOffice <[email protected]> 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(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
