extensions/source/propctrlr/browserline.cxx | 2 extensions/uiconfig/spropctrlr/ui/formproperties.ui | 10 ++-- svx/uiconfig/ui/formpropertydialog.ui | 49 ++++---------------- 3 files changed, 17 insertions(+), 44 deletions(-)
New commits: commit 6c1b3665abeda5a644adbe4686e6349df15c707a Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 00:04:27 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:13:14 2026 +0100 propctrlr: Update class member name in comment OBrowserLine::m_xContainer was renamed to to OBrowserLine::m_xGrid in commit f956d81ac75450710629ee883bc2193f13dd6091 Author: Michael Weghorn <[email protected]> Date: Mon Dec 16 11:48:41 2024 +0100 Port OBrowserLine to new weld::Grid API Update this comment to also use the new name. Change-Id: I34cbb0bd84908cf83fd5f641e84fa617be28bd0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197620 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 8240055a254c..a227f5859543 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -59,7 +59,7 @@ namespace pcr , m_xFtTitle(m_xBuilder->weld_label(u"label"_ustr)) , m_xBrowseButton(m_xBuilder->weld_button(u"browse"_ustr)) , m_xAdditionalBrowseButton(m_xBuilder->weld_button(u"morebrowse"_ustr)) - , m_pInitialControlParent(pInitialControlParent) // controls start with this as their parent and need to be moved into m_xContainer + , m_pInitialControlParent(pInitialControlParent) // controls start with this as their parent and need to be moved into m_xGrid , m_pParent(pParent) , m_pControlWindow( nullptr ) , m_pBrowseButton(nullptr) commit 708726a6bd0a7031f90974d66b2b29abb824ec6d Author: Michael Weghorn <[email protected]> AuthorDate: Mon Jan 19 23:45:13 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:13:06 2026 +0100 Resave formproperties.ui, formpropertydialog.ui with glade 3.40 These .ui files are used in the dialog that can be triggered as follows: * start Writer * "Form" -> "Form Navigator" * right-click on "Forms" -> "New" -> "Form" * right-click on the new "Form" entry and select "Properties" in the context menu Change-Id: I840eb065c55c395beb57b164c0be8776f014db9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197619 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/extensions/uiconfig/spropctrlr/ui/formproperties.ui b/extensions/uiconfig/spropctrlr/ui/formproperties.ui index 3a5fd354d4aa..a878c7b546a8 100644 --- a/extensions/uiconfig/spropctrlr/ui/formproperties.ui +++ b/extensions/uiconfig/spropctrlr/ui/formproperties.ui @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="pcr"> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> </object> @@ -23,8 +23,8 @@ </child> <child> <object class="GtkBox" id="controlparent"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="orientation">vertical</property> <child> <placeholder/> diff --git a/svx/uiconfig/ui/formpropertydialog.ui b/svx/uiconfig/ui/formpropertydialog.ui index af05846b5e9a..1aabd45f9868 100644 --- a/svx/uiconfig/ui/formpropertydialog.ui +++ b/svx/uiconfig/ui/formpropertydialog.ui @@ -1,24 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="FormPropertyDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="default_width">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> + <property name="border-width">6</property> + <property name="default-width">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="layout-style">end</property> <child> <placeholder/> </child> @@ -26,7 +23,7 @@ <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> @@ -34,36 +31,12 @@ <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="container"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property>
