vcl/source/window/builder.cxx | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
New commits:
commit 662245e653c3c8f7f1342be065ff332a34e90d8b
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Nov 25 13:39:28 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Dec 1 17:57:15 2020 +0100
jsdialog: enable Pivot Table dialogs
Change-Id: Ic467c95f0d56d28e6c6590d488e2a0b10f65e803
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106997
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d141dace9e98..46d1cae2583f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -153,17 +153,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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
