diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-28 15:38:32 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-29 12:25:20 +0200 |
| commit | a30e71bc1184d30bc9c95c2e02779660d58e3be9 (patch) | |
| tree | 5a08f547ac953ed4d542cac86648b950b062b7fd /vcl/jsdialog | |
| parent | b206dda731e7c4390d6c9fe9c66feb8e903d3786 (diff) | |
sidebar: unify LineWidthPopup with other WeldToolbarPopups
Change-Id: I9dd0d2b223972683a9066f0069e055175349526f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118023
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119654
Tested-by: Jenkins
Diffstat (limited to 'vcl/jsdialog')
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 879ae9bf9d72..e250dcfe875e 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -223,6 +223,9 @@ JSDialogNotifyIdle::generatePopupMessage(VclPtr<vcl::Window> pWindow, OUString s if (!pWindow || !m_aNotifierWindow) return aJsonWriter; + if (!pWindow->GetParentWithLOKNotifier()) + return aJsonWriter; + pWindow->DumpAsPropertyTree(*aJsonWriter); aJsonWriter->put("jsontype", "dialog"); @@ -230,7 +233,7 @@ JSDialogNotifyIdle::generatePopupMessage(VclPtr<vcl::Window> pWindow, OUString s aJsonWriter->put("cancellable", true); aJsonWriter->put("popupParent", sParentId); aJsonWriter->put("clickToClose", sCloseId); - aJsonWriter->put("id", pWindow->GetLOKWindowId()); + aJsonWriter->put("id", pWindow->GetParentWithLOKNotifier()->GetLOKWindowId()); return aJsonWriter; } |