[Libreoffice-commits] core.git: vcl/jsdialog

[Henry Castro (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40588ede2070e5b01ad4d2c71894bd19d6ec9738
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Dec 4 16:49:31 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Fri Dec 18 18:20:18 2020 +0100

    lok: jsbuilder: avoid sending early id to client side
    
    In the case of Macro Selector Dialog it is not required
    to send the id too early when the dialog is created and
    it is not initialized yet.
    
    Change-Id: I22fb05bd9ecff49b3e9eda19737750379a61dd69
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107244
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 08e66eedb6f5..e4dd0f4a8b96 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -404,7 +404,7 @@ std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id)
     RememberWidget("__DIALOG__", pRet.get());
 
     const vcl::ILibreOfficeKitNotifier* pNotifier = pDialog->GetLOKNotifier();
-    if (pNotifier)
+    if (pNotifier && id != "MacroSelectorDialog")
     {
         tools::JsonWriter aJsonWriter;
         m_aOwnedToplevel->DumpAsPropertyTree(aJsonWriter);