desktop/source/lib/init.cxx | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 0e8588df1bb463437c9cb911531f5360d9b4f807
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Jun 16 12:06:56 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Jul 3 07:40:43 2020 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97744
Tested-by: Jenkins
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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
