core.git: Branch 'distro/collabora/co-24.04' - vcl/jsdialog

[Szymon Kłos (via logerrit)]

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

New commits:
commit 5ee46b44d207a0416623a5c506bb2052052500a7
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Feb 21 10:23:00 2024 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Feb 21 13:06:29 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>

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);