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

[Henry Castro (via logerrit)]

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

New commits:
commit 5780fcc21f8f1ed9409eff2b82b7c33e54ed8542
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Dec 4 16:49:31 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Jan 18 21:21:06 2021 +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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109135
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index f0cb0475db08..649893bb6832 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -396,7 +396,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")
     {
         std::stringstream aStream;
         boost::property_tree::ptree aTree = m_aOwnedToplevel->DumpAsPropertyTree();