core.git: vcl/jsdialog

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 0feb1b2c4a11317159195e451bf7a1a0dd755dd8
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Feb 21 10:23:00 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Feb 23 11:54:09 2024 +0100

    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.me...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    (cherry picked from commit 5ee46b44d207a0416623a5c506bb2052052500a7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163767
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index abd57bf32b85..a7199e2ed960 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1312,13 +1312,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);