[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/jsdialog

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Fri Feb 5 08:16:20 UTC 2021


 vcl/jsdialog/jsdialogbuilder.cxx |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit a1d516a9b96fb8b40edc5934e69bf2b0a1d2ecd3
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jan 19 14:08:35 2021 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Fri Feb 5 09:15:36 2021 +0100

    jsdialog: enqueue update on dialog weld
    
    Change-Id: I01f14cdf0aa3ea16cd311aed9abe14423e2ec846
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109727
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109958
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 4d4802138fcf..b4c214f3e4d7 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -472,18 +472,8 @@ std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id,
 
         RememberWidget("__DIALOG__", pRet.get());
 
-        const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier();
-        if (pNotifier)
-        {
-            std::stringstream aStream;
-            boost::property_tree::ptree aTree = m_aOwnedToplevel->DumpAsPropertyTree();
-            aTree.put("id", m_aOwnedToplevel->GetLOKWindowId());
-            boost::property_tree::write_json(aStream, aTree);
-            const std::string message = aStream.str();
-            pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str());
-        }
-
         initializeSender(GetNotifierWindow(), GetContentWindow(), GetTypeOfJSON());
+        sendFullUpdate();
     }
 
     return pRet;


More information about the Libreoffice-commits mailing list