diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-06-16 12:06:56 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-03 07:40:43 +0200 |
| commit | 0e8588df1bb463437c9cb911531f5360d9b4f807 (patch) | |
| tree | eb9bc18f7d9ab8a09b53f6f35581ae324b5be5e3 /desktop/source | |
| parent | f7b2e98bb76d2ce37ddc886ab503c6b160d8849d (diff) | |
jsdialog: try call welded action even if window doesn't exist
Change-Id: I8ae96d2e61899c89b5ddb8ff362d8a066ded3960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96922
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97744
Tested-by: Jenkins
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index eabca148f850..792b6f8f5419 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3607,12 +3607,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin if (!pWindow && nWindowId >= 1000000000 /* why unsigned? */) pWindow = getSidebarWindow(); - if (!pWindow) - { - SetLastExceptionMsg("Document doesn't support dialog rendering, or window not found."); - return; - } - else if (aMap.find("id") != aMap.end()) + if (aMap.find("id") != aMap.end()) { static const OUString sClickAction("CLICK"); static const OUString sSelectAction("SELECT"); @@ -3727,6 +3722,12 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin } } + if (!pWindow) + { + SetLastExceptionMsg("Document doesn't support dialog rendering, or window not found."); + return; + } + if (!bIsWeldedDialog || bContinueWithLOKWindow) { WindowUIObject aUIObject(pWindow); |