vcl/qt5/QtInstanceBuilder.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 5f5bad351738f76ad3755d7b5fe713346f6819a0
Author: Michael Weghorn <[email protected]>
AuthorDate: Fri Feb 27 00:15:21 2026 +0100
Commit: Michael Weghorn <[email protected]>
CommitDate: Sat Feb 28 00:55:55 2026 +0100
tdf#130857 qt weld: Support sc "Data Bar" dialog
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
The dialog using the UI file can be triggered like this:
* start Calc
* press the "Conditional" menu button in the toolbar
and activate the "Data Bar..." menu entry
* in the dialog, press the "More Options..." button
Change-Id: I4b0f4eb6c33d35df77c1c252f33655a27a5c59e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200549
Reviewed-by: Michael Weghorn <[email protected]>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 1525af9dd101..700d298267d2 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -148,6 +148,7 @@ constexpr auto SUPPORTED_UI_FILES =
frozen::make_unordered_set<std::u16string_vi
u"modules/scalc/ui/colwidthdialog.ui",
u"modules/scalc/ui/condformatmanager.ui",
u"modules/scalc/ui/conditionalformatdialog.ui",
+ u"modules/scalc/ui/databaroptions.ui",
u"modules/scalc/ui/definedatabaserangedialog.ui",
u"modules/scalc/ui/definetablerangedialog.ui",
u"modules/scalc/ui/deletecells.ui",
commit 23451496bf6d07662ab1a22820836698b4a717d9
Author: Michael Weghorn <[email protected]>
AuthorDate: Fri Feb 27 00:08:12 2026 +0100
Commit: Michael Weghorn <[email protected]>
CommitDate: Sat Feb 28 00:55:47 2026 +0100
tdf#130857 qt weld: Support Icon Set in sc Conditional Formatting dlg
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
The dialog using the UI file can be triggered like this:
* start Calc
* press the "Conditional" menu button in the toolbar
and activate the "Icon Set..." menu entry
Without this commit in place, the following assert
would be triggered because the parent was declared
as supported, but this UI file not yet:
soffice.bin:
/home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtInstanceContainer.cxx:27:
auto QtInstanceContainer::move(weld::Widget *, weld::Container *)::(anonymous
class)::operator()() const: Assertion `pQtInstanceWidget' failed.
Change-Id: I5d61e785db68277e345a712a7f65edf086bdefc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200548
Reviewed-by: Michael Weghorn <[email protected]>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 956290b2885b..1525af9dd101 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -341,6 +341,7 @@ constexpr auto SUPPORTED_WITH_QT_PARENT =
frozen::make_unordered_set<std::u16str
u"filter/ui/pdfuserinterfacepage.ui",
u"filter/ui/pdfviewpage.ui",
u"modules/scalc/ui/conditionalentry.ui",
+ u"modules/scalc/ui/conditionaliconset.ui",
u"modules/scalc/ui/printeroptions.ui",
u"modules/scalc/ui/sortcriteriapage.ui",
u"modules/scalc/ui/sortkey.ui",
