diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-11-25 13:39:28 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-12-07 12:19:32 +0100 |
| commit | 8f4e206520d9b6b5f41f08f5fc911123b4541320 (patch) | |
| tree | 0040746803a9c36316e79ac8e5c7dd21c8ecac45 | |
| parent | 43d07ddf487fae1b966abf00a36612b109ed01fc (diff) | |
jsdialog: enable Pivot Table dialogs
Change-Id: Ic467c95f0d56d28e6c6590d488e2a0b10f65e803
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106997
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107338
Tested-by: Jenkins
| -rw-r--r-- | vcl/source/window/builder.cxx | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index fa759ead51f8..3a05bb6a8f9d 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -166,17 +166,27 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString { bool bUseJSBuilder = false; - if (bMobile) - { - if (rUIFile == "modules/swriter/ui/wordcount-mobile.ui" || - rUIFile == "svx/ui/findreplacedialog-mobile.ui" || - rUIFile == "modules/swriter/ui/watermarkdialog.ui" || - rUIFile == "modules/scalc/ui/validationdialog.ui" || - rUIFile == "modules/scalc/ui/validationcriteriapage.ui" || - rUIFile == "modules/scalc/ui/validationhelptabpage-mobile.ui" || - rUIFile == "modules/scalc/ui/erroralerttabpage-mobile.ui" || - rUIFile == "modules/scalc/ui/validationdialog.ui") + if (comphelper::LibreOfficeKit::isActive()) + { + if (bMobile) + { + if (rUIFile == "modules/swriter/ui/wordcount-mobile.ui" || + rUIFile == "svx/ui/findreplacedialog-mobile.ui" || + rUIFile == "modules/swriter/ui/watermarkdialog.ui" || + rUIFile == "modules/scalc/ui/validationdialog.ui" || + rUIFile == "modules/scalc/ui/validationcriteriapage.ui" || + rUIFile == "modules/scalc/ui/validationhelptabpage-mobile.ui" || + rUIFile == "modules/scalc/ui/erroralerttabpage-mobile.ui" || + rUIFile == "modules/scalc/ui/validationdialog.ui") + { + bUseJSBuilder = true; + } + } + + if (rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui") + { bUseJSBuilder = true; + } } if (bUseJSBuilder) |