sc/uiconfig/scalc/ui/checkwarningdialog.ui | 38 ++++++++++++++--------------- vcl/qt5/QtBuilder.cxx | 4 +++ 2 files changed, 23 insertions(+), 19 deletions(-)
New commits: commit 0d927b52a079e73a0ab8760f583360466628db0b Author: Michael Weghorn <[email protected]> AuthorDate: Fri Sep 27 20:15:11 2024 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Sep 28 09:34:49 2024 +0200 tdf#130857 qt weld: Ignore placeholders In QtBuilder, ignore placeholders as encountered e.g. in "sc/uiconfig/scalc/ui/checkwarningdialog.ui" (that's not yet in the list of supported .ui files for QtInstanceBuilder yet). VclBuilder mostly ignores them as well, see VclBuilder::makeObject. Change-Id: I68481e31365561719af5e72ee20adb428b642941 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174071 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx index 09e90354fc6e..58263b981cf8 100644 --- a/vcl/qt5/QtBuilder.cxx +++ b/vcl/qt5/QtBuilder.cxx @@ -70,6 +70,10 @@ QObject* QtBuilder::insertObject(QObject* pParent, const OUString& rClass, const QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, const OUString& sID, stringmap& rMap) { + // ignore placeholders + if (sName.empty()) + return nullptr; + QWidget* pParentWidget = qobject_cast<QWidget*>(pParent); QObject* pObject = nullptr; commit 4dc918239879fe3252d803b62834592c6d1c495b Author: Michael Weghorn <[email protected]> AuthorDate: Fri Sep 27 20:04:43 2024 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Sep 28 09:34:42 2024 +0200 sc: Resave checkwarningdialog.ui with glade 3.40 Change-Id: Idb8efd7a8be06436b16572bfcf1d352a823e2497 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174070 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/uiconfig/scalc/ui/checkwarningdialog.ui b/sc/uiconfig/scalc/ui/checkwarningdialog.ui index f1813e48b254..06a410129592 100644 --- a/sc/uiconfig/scalc/ui/checkwarningdialog.ui +++ b/sc/uiconfig/scalc/ui/checkwarningdialog.ui @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sc"> <requires lib="gtk+" version="3.20"/> <object class="GtkMessageDialog" id="CheckWarningDialog"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="type_hint">dialog</property> - <property name="message_type">warning</property> + <property name="type-hint">dialog</property> + <property name="message-type">warning</property> <property name="text" translatable="yes" context="checkwarningdialog|CheckWarningDialog">You are pasting data into cells that already contain data.</property> - <property name="secondary_text" translatable="yes" context="checkwarningdialog|CheckWarningDialog">Do you really want to overwrite the existing data?</property> + <property name="secondary-text" translatable="yes" context="checkwarningdialog|CheckWarningDialog">Do you really want to overwrite the existing data?</property> <child internal-child="vbox"> <object class="GtkBox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="homogeneous">True</property> <child> <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -38,8 +38,8 @@ <object class="GtkButton" id="no"> <property name="label" translatable="yes" context="stock">_No</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -52,10 +52,10 @@ <object class="GtkButton" id="yes"> <property name="label" translatable="yes" context="stock">_Yes</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="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> @@ -75,12 +75,12 @@ <object class="GtkCheckButton" id="ask"> <property name="label" translatable="yes" context="checkwarningdialog|ask">Warn me about this in the future.</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property>
