svx/uiconfig/ui/linkwarndialog.ui | 48 +++++++++++++++++------------------ vcl/qt5/QtInstanceBuilder.cxx | 1 vcl/source/weld/DialogController.cxx | 2 - 3 files changed, 26 insertions(+), 25 deletions(-)
New commits: commit a591649e86aec306e5148e637be951848ec18aca Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 20 00:18:09 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 10:07:26 2026 +0100 tdf#130857 Don't try to get weld::Container when weld::Widget is enough weld::MessageDialogController::m_xRelocate is a weld::Widget, so there's no need to try to get a weld::Container using weld::Builder::weld_container. Use weld::Builder::weld_widget instead. This fixes an assert seen triggered with the qt6 VCL plugin and SAL_VCL_QT_USE_WELDED_WIDGETS=1 with an upcoming commit declaring support for the "Confirm Linked Graphic" dialog that can be triggered as follows: * start Writer * "Insert" -> "Image" * select an image in the file dialog and make sure that the "Link" checkbox is checked, confirm with "Open" Assert seen without this commit in place: soffice.bin: /home/michi/development/git/libreoffice/vcl/qt6/../qt5/QtInstanceBuilder.cxx:473: auto QtInstanceBuilder::weld_container(const OUString &)::(anonymous class)::operator()() const: Assertion `pWidget->layout() && "no layout"' failed. The widget in question is the "ask" GtkCheckButton in svx/uiconfig/ui/linkwarndialog.ui, so not really a container. Change-Id: I04759d33549103ed11339debc1b8e1333a0d2a7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199771 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/source/weld/DialogController.cxx b/vcl/source/weld/DialogController.cxx index dbbc83c79729..29d252561d08 100644 --- a/vcl/source/weld/DialogController.cxx +++ b/vcl/source/weld/DialogController.cxx @@ -58,7 +58,7 @@ MessageDialogController::MessageDialogController(weld::Widget* pParent, const OU { if (!rRelocateId.isEmpty()) { - m_xRelocate = m_xBuilder->weld_container(rRelocateId); + m_xRelocate = m_xBuilder->weld_widget(rRelocateId); m_xOrigParent = m_xRelocate->weld_parent(); //fdo#75121, a bit tricky because the widgets we want to align with //don't actually exist in the ui description, they're implied commit 2ba83455509118841e68efe92cc59487cdafcb46 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 19 23:37:17 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 10:07:19 2026 +0100 svx: Resave linkwarndialog.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Insert" -> "Image..." * select an image and confirm in the file dialog Change-Id: I7c7f88c56ac560724317d3c662c908f36a6d2731 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199768 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/svx/uiconfig/ui/linkwarndialog.ui b/svx/uiconfig/ui/linkwarndialog.ui index 050266fca869..df5444c9cbba 100644 --- a/svx/uiconfig/ui/linkwarndialog.ui +++ b/svx/uiconfig/ui/linkwarndialog.ui @@ -1,63 +1,63 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.24"/> <object class="GtkMessageDialog" id="LinkWarnDialog"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="title" translatable="yes" context="linkwarndialog|LinkWarnDialog">Confirm Linked Graphic</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="type_hint">dialog</property> - <property name="skip_taskbar_hint">True</property> - <property name="message_type">question</property> + <property name="type-hint">dialog</property> + <property name="skip-taskbar-hint">True</property> + <property name="message-type">question</property> <property name="text" translatable="yes" context="linkwarndialog|LinkWarnDialog">The file %FILENAME will not be stored along with your document, but only referenced as a link.</property> - <property name="secondary_text" translatable="yes" context="linkwarndialog|LinkWarnDialog">This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?</property> + <property name="secondary-text" translatable="yes" context="linkwarndialog|LinkWarnDialog">This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="messagedialog-action_area"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="linkwarndialog|ok">_Keep Link</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> - <property name="non_homogeneous">True</property> + <property name="non-homogeneous">True</property> </packing> </child> <child> <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="linkwarndialog|cancel">_Embed Graphic</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> - <property name="non_homogeneous">True</property> + <property name="non-homogeneous">True</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> @@ -65,10 +65,10 @@ <object class="GtkCheckButton" id="ask"> <property name="label" translatable="yes" context="linkwarndialog|ask">_Ask when linking a graphic</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> commit 79bd46a12ce21db465f08160c58fa4c8271d0fed Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 19 23:29:18 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Feb 20 10:07:12 2026 +0100 tdf#130857 qt weld: Support "Delete Color?" 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 can be triggered like this: * start Writer * "Tools" -> "Options" * navigate to the "Charts" -> "Default Colors" page * select color * press the "Delete" button Change-Id: I5e980b11a38ea418eb7d389c66ab04a0416f8096 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199767 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index a2224be2a1b5..dec9109b94ea 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -93,6 +93,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"cui/ui/pastespecial.ui", u"cui/ui/positionsizedialog.ui", u"cui/ui/qrcodegen.ui", + u"cui/ui/querydeletechartcolordialog.ui", u"cui/ui/querydeletedictionarydialog.ui", u"cui/ui/querydeletelineenddialog.ui", u"cui/ui/querydeletelinestyledialog.ui",
