extensions/source/dbpilots/controlwizard.cxx | 4 ++-- extensions/source/dbpilots/controlwizard.hxx | 3 +-- extensions/uiconfig/spropctrlr/ui/datefield.ui | 12 ++++++------ extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui | 12 ++++++------ 4 files changed, 15 insertions(+), 16 deletions(-)
New commits: commit 392f2b17b11b0d884e07f8c6c7cbd711912b0cce Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 25 23:58:30 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:54:24 2026 +0100 spropctrlr: Resave datefield.ui with glade 3.40 This UI file is used by the dialog that can be triggered like this: * start Writer * "Form" -> "More Fields" -> "Date Field" * click and drag mouse in the document to insert the form control * double-click on the inserted form control to open the properties dialog Change-Id: I4449376c2074fb6b56311f5ea40c5a49cd47f7be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200363 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/uiconfig/spropctrlr/ui/datefield.ui b/extensions/uiconfig/spropctrlr/ui/datefield.ui index b9aa60fea0f4..b7c17b291e4c 100644 --- a/extensions/uiconfig/spropctrlr/ui/datefield.ui +++ b/extensions/uiconfig/spropctrlr/ui/datefield.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="pcr"> <requires lib="gtk+" version="3.24"/> <object class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">x-office-calendar</property> + <property name="can-focus">False</property> + <property name="icon-name">x-office-calendar</property> <property name="icon_size">2</property> </object> <object class="GtkBox" id="datefield"> @@ -17,8 +17,8 @@ <object class="GtkEntry" id="entry"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="truncate-multiline">True</property> <property name="hexpand">True</property> + <property name="truncate-multiline">True</property> </object> <packing> <property name="expand">False</property> @@ -31,9 +31,9 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> - <property name="image">image7</property> <property name="margin-start">1</property> - <property name="always_show_image">True</property> + <property name="image">image7</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> commit 55c65be3c2e1fd28f75f61a090e3c9fdbfce4b18 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 25 23:54:03 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:54:17 2026 +0100 dbpilots: Drop OControlWizardPage_Base typedef Change-Id: I116d8366e90998c0234ff93881c403d82d1811cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200362 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 3e32374481fe..910f020c3b40 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -73,7 +73,7 @@ namespace dbp }; OControlWizardPage::OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID) - : OControlWizardPage_Base(pPage, pWizard, rUIXMLDescription, rID) + : vcl::OWizardPage(pPage, pWizard, rUIXMLDescription, rID) , m_pDialog(pWizard) { m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width() * WIZARD_SIZE_X, @@ -197,7 +197,7 @@ namespace dbp m_xFormContentType->set_label(compmodule::ModuleRes(pCommandTypeResourceId)); } - OControlWizardPage_Base::initializePage(); + vcl::OWizardPage::initializePage(); } OControlWizard::OControlWizard(weld::Window* _pParent, diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 9e6bb1ffa0e1..18da64a382a1 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -43,8 +43,7 @@ namespace dbp }; class OControlWizard; - typedef ::vcl::OWizardPage OControlWizardPage_Base; - class OControlWizardPage : public OControlWizardPage_Base + class OControlWizardPage : public vcl::OWizardPage { OControlWizard* m_pDialog; std::unique_ptr<weld::Label> m_xFormDatasourceLabel; commit 8c6fd7ba5c96f94934c12a41669312fea1b658e7 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 25 23:37:16 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:54:09 2026 +0100 spropctrlr: Resave formattedcontrol.ui with glade 3.40 This UI file is used by the dialog that can be triggered like this: * start Writer * "Form" -> "Formatted Field" * click and drag mouse in the document to insert the form control * double-click on the inserted form control to open the properties dialog Change-Id: Ie3279dbae4d81848abbb1ec86f2a4e9df1cc9988 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200361 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui b/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui index bf26e55d4eb4..3318760d2556 100644 --- a/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui +++ b/extensions/uiconfig/spropctrlr/ui/formattedcontrol.ui @@ -1,20 +1,20 @@ <?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="GtkAdjustment" id="adjustmentForwardBackward"> <property name="lower">-10000</property> <property name="upper">10000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkSpinButton" id="formattedcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustmentForwardBackward</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustmentForwardBackward</property> <property name="digits">2</property> </object> </interface>
