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

[Henry Castro (via logerrit)]

 vcl/source/window/builder.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 10760a18a03427659700460fa81cbf7c69d6a637
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Dec 4 16:32:30 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Jan 18 21:00:45 2021 +0100

    lok: use JSDialog Builder to create a Macro Selector Dialog
    
    The Macro Selector Dialog should be created for desktop too.
    The JS Builder has an implementation to send "jsdialog: "
    data to the client side.
    
    Change-Id: If29660467e494323ac26605e704ee9bf15725fd5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107243
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109134
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b795ea03b629..591052362598 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -190,7 +190,8 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
             || rUIFile == "modules/scalc/ui/datafielddialog.ui"
             || rUIFile == "modules/scalc/ui/pivotfielddialog.ui"
             || rUIFile == "modules/scalc/ui/datafieldoptionsdialog.ui"
-            || rUIFile == "svx/ui/fontworkgallerydialog.ui")
+            || rUIFile == "svx/ui/fontworkgallerydialog.ui"
+            || rUIFile == "cui/ui/macroselectordialog.ui")
         {
             bUseJSBuilder = true;
         }