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

Mert Tumer (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 12 10:00:04 UTC 2021


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

New commits:
commit eb1a1a2a0f0d0d55e38d212c2165c88c5697eb9e
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Wed Dec 16 23:00:11 2020 +0300
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jan 12 10:59:30 2021 +0100

    jsdialogs: Use JS dialog for Fontwork dialog
    
    Change-Id: I4d2206550f7d3948f373c803888c7d19034e42c4
    Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108684
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    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 97f48ddf545d..b795ea03b629 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -189,7 +189,8 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
             || rUIFile == "modules/scalc/ui/fourieranalysisdialog.ui"
             || rUIFile == "modules/scalc/ui/datafielddialog.ui"
             || rUIFile == "modules/scalc/ui/pivotfielddialog.ui"
-            || rUIFile == "modules/scalc/ui/datafieldoptionsdialog.ui")
+            || rUIFile == "modules/scalc/ui/datafieldoptionsdialog.ui"
+            || rUIFile == "svx/ui/fontworkgallerydialog.ui")
         {
             bUseJSBuilder = true;
         }


More information about the Libreoffice-commits mailing list