extensions/source/propctrlr/browserpage.cxx | 2 +- extensions/source/propctrlr/browserpage.hxx | 6 +++--- extensions/source/propctrlr/formcontroller.hxx | 12 +++--------- 3 files changed, 7 insertions(+), 13 deletions(-)
New commits: commit da02d406ed9d37abab9d4bacfb5c265953bce253 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 09:21:40 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:14:10 2026 +0100 propctrlr: Drop FormController_PropertyBase2 typedef It's only used once a few lines below. While at it, also drop the unnecessary FormController forward-declaration. The class is defined just a few lines further down. Change-Id: I4cfa1a6fc752bf5e267db4cbbf25829e08ccec89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197631 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index f3415057fc80..376bf57a492b 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -27,22 +27,16 @@ namespace pcr { - - - //= FormController - - class FormController; typedef ::cppu::OPropertySetHelper FormController_PropertyBase1; - typedef ::comphelper::OPropertyArrayUsageHelper< FormController > FormController_PropertyBase2; /** Legacy implementation of com.sun.star.form.PropertyBrowserController Nowadays only a wrapper around an ObjectInspector using a DefaultFormComponentInspectorModel. */ - class FormController :public OPropertyBrowserController - ,public FormController_PropertyBase1 - ,public FormController_PropertyBase2 + class FormController : public OPropertyBrowserController, + public FormController_PropertyBase1, + public comphelper::OPropertyArrayUsageHelper<FormController> { private: css::uno::Reference< css::beans::XPropertySet > commit 8de49d95c976e85fb17a62e1b471e8aad9bff933 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 09:16:44 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:14:01 2026 +0100 propctrlr: Don't create OBrowserListBox on heap Change-Id: Icfad3eeecdd913077a102ad359ed8cc5fc4bb279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197630 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 53886fddde43..b902802f8cc9 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -26,7 +26,7 @@ OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialCo : m_pParent(pParent) , m_xBuilder(Application::CreateBuilder(pParent, u"modules/spropctrlr/ui/browserpage.ui"_ustr)) , m_xContainer(m_xBuilder->weld_container(u"BrowserPage"_ustr)) - , m_xListBox(new OBrowserListBox(*m_xBuilder, pInitialControlContainer)) + , m_aBrowserListBox(*m_xBuilder, pInitialControlContainer) { } diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 8c7226e9ef17..5595b4bbe67f 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -30,7 +30,7 @@ private: weld::Container* m_pParent; std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xContainer; - std::unique_ptr<OBrowserListBox, o3tl::default_delete<OBrowserListBox>> m_xListBox; + OBrowserListBox m_aBrowserListBox; public: // TODO inherit from BuilderPage @@ -39,8 +39,8 @@ public: void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); } - OBrowserListBox& getListBox() { return *m_xListBox; } - const OBrowserListBox& getListBox() const { return *m_xListBox; } + OBrowserListBox& getListBox() { return m_aBrowserListBox; } + const OBrowserListBox& getListBox() const { return m_aBrowserListBox; } void detach() {
