summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-09-17 10:18:23 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2020-09-22 13:10:17 +0200
commita22a6cb8c3afdd7db3a5d23c64cd2f20d4fbd291 (patch)
tree02cf38b3e0cc877ed27b2cd2b388ba478e61659e /desktop
parent8727e36b4305fa6957bd74d8efc631a3a4b27a1a (diff)
jsdialog: use window only if visible
When there is a name conflict we should take currently visible window. Change-Id: Iaccf03a78b083ecaca0ee6aa538674a6de093a4b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102903 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103142
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 91613147b624..d6cd2f3fb9ce 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3748,7 +3748,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long
if (!bIsWeldedDialog)
{
WindowUIObject aUIObject(pWindow);
- std::unique_ptr<UIObject> pUIWindow(aUIObject.get_child(aMap["id"]));
+ std::unique_ptr<UIObject> pUIWindow(aUIObject.get_visible_child(aMap["id"]));
if (pUIWindow) {
bool bIsClickAction = false;