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

[merttumer (via logerrit)]

 vcl/source/window/builder.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0548f0fa8699f6192d1fa688b3081b18aefaee03
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Mon Apr 26 06:29:43 2021 +0300
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri May 14 16:20:54 2021 +0200

    Added Text Import Dialog to JSDialogs list
    
    Change-Id: I8da4c929ebe7b93fe9211ba432ce321e31482a8f
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114636
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115454
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 077534436651..ce39e7a81ca6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -186,7 +186,6 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
             || rUIFile == "modules/scalc/ui/selectsource.ui"
             || rUIFile == "modules/scalc/ui/managenamesdialog.ui"
             || rUIFile == "modules/scalc/ui/definename.ui"
-            || rUIFile == "cui/ui/macroselectordialog.ui"
             || rUIFile == "modules/scalc/ui/correlationdialog.ui"
             || rUIFile == "modules/scalc/ui/samplingdialog.ui"
             || rUIFile == "modules/scalc/ui/descriptivestatisticsdialog.ui"
@@ -200,11 +199,13 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
             || rUIFile == "modules/scalc/ui/ztestdialog.ui"
             || rUIFile == "modules/scalc/ui/chisquaretestdialog.ui"
             || rUIFile == "modules/scalc/ui/fourieranalysisdialog.ui"
-            || rUIFile == "uui/ui/macrowarnmedium.ui"
             || 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"
+            || rUIFile == "uui/ui/macrowarnmedium.ui"
+            || rUIFile == "modules/scalc/ui/textimportcsv.ui")
         {
             bUseJSBuilder = true;
         }