diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2024-02-21 10:23:00 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2024-02-21 13:06:29 +0100 |
| commit | 5ee46b44d207a0416623a5c506bb2052052500a7 (patch) | |
| tree | 76c8827a6c3237d5af92a71a6c3cea621d15618d /vcl/jsdialog | |
| parent | e2ca1c82dbce30d625d33c0bd8c3c080294f93b8 (diff) | |
jsdialog: don't duplicate MessageDialog messages
Remove hardcoded out-of-queue message for MessageDialog.
Now we send the messages in JSMessageDialog::run().
This prevents us from overwriting correct jsdialog window
in Online when we see messages before document was loaded
(from interaction handlers, like: macro warning, corrupted
file, etc.)
Change-Id: I364ac8460507dd6613b978230c9cf61cc5dfe91d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163679
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'vcl/jsdialog')
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 48946baa15f9..904ee9076f79 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -1310,13 +1310,6 @@ JSInstanceBuilder::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMe pNotifier = xMessageDialog->GetLOKNotifier(); if (pNotifier) { - tools::JsonWriter aJsonWriter; - xMessageDialog->DumpAsPropertyTree(aJsonWriter); - aJsonWriter.put("id", xMessageDialog->GetLOKWindowId()); - aJsonWriter.put("jsontype", "dialog"); - OString message(aJsonWriter.finishAndGetAsOString()); - pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message); - OUString sWindowId = OUString::number(xMessageDialog->GetLOKWindowId()); InsertWindowToMap(sWindowId); xMessageDialog->SetLOKTunnelingState(false); |