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

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 2 11:20:42 UTC 2020


 vcl/source/window/builder.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit a001b5a8626789ec93ad5d05a32c8bd76250d083
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 16 08:40:13 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Jul 2 13:20:01 2020 +0200

    notebookbar: use JSInstanceBuilder for styles preview in online
    
    Change-Id: I826ca92aec5e324b935dfc7c52fc95c6ce5c5e05
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96915
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97732
    Tested-by: Jenkins

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1d897a5d8f08..e1c00944fc8c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -174,6 +174,11 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString
 
 weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile)
 {
+    if (comphelper::LibreOfficeKit::isActive() && rUIFile == "svx/ui/stylespreview.ui")
+    {
+        return new JSInstanceBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile, css::uno::Reference<css::frame::XFrame>());
+    }
+
     return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile);
 }
 


More information about the Libreoffice-commits mailing list