extensions/source/propctrlr/browserlistbox.cxx | 19 ++----- extensions/source/propctrlr/browserlistbox.hxx | 8 --- extensions/source/propctrlr/browserpage.cxx | 26 +++++----- extensions/source/propctrlr/browserpage.hxx | 62 ++++++++++++------------- solenv/clang-format/excludelist | 2 5 files changed, 53 insertions(+), 64 deletions(-)
New commits: commit 4813ddc548b7d193e54e52bed113656c8f898fcb Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 09:14:11 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:13:52 2026 +0100 propctrlr: clang-format OBrowserPage code This in particular gets rid of an extra indentation level. Change-Id: I0ac0d36fec31b6261ed55c8829ff7fd5dc4b72cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197629 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 610315c18fb5..53886fddde43 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -22,20 +22,20 @@ namespace pcr { - OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialControlContainer) - : 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)) - { - } +OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialControlContainer) + : 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)) +{ +} - OBrowserPage::~OBrowserPage() - { - if (m_pParent) - detach(); - assert(!m_pParent); - } +OBrowserPage::~OBrowserPage() +{ + if (m_pParent) + detach(); + assert(!m_pParent); +} } // namespace pcr /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 5f9220a7961f..8c7226e9ef17 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -24,38 +24,38 @@ namespace pcr { - class OBrowserPage +class OBrowserPage +{ +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; + +public: + // TODO inherit from BuilderPage + explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer); + ~OBrowserPage(); + + void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); } + + OBrowserListBox& getListBox() { return *m_xListBox; } + const OBrowserListBox& getListBox() const { return *m_xListBox; } + + void detach() + { + assert(m_pParent && "already attached"); + m_pParent->move(m_xContainer.get(), nullptr); + m_pParent = nullptr; + } + + void reattach(weld::Container* pNewParent) { - 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; - - public: - // TODO inherit from BuilderPage - explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer); - ~OBrowserPage(); - - void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); } - - OBrowserListBox& getListBox() { return *m_xListBox; } - const OBrowserListBox& getListBox() const { return *m_xListBox; } - - void detach() - { - assert(m_pParent && "already attached"); - m_pParent->move(m_xContainer.get(), nullptr); - m_pParent = nullptr; - } - - void reattach(weld::Container* pNewParent) - { - assert(!m_pParent && "already attached"); - m_pParent = pNewParent; - m_pParent->move(m_xContainer.get(), pNewParent); - } - }; + assert(!m_pParent && "already attached"); + m_pParent = pNewParent; + m_pParent->move(m_xContainer.get(), pNewParent); + } +}; } // namespace pcr /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 491658fb0734..7f28044ac1d4 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3491,8 +3491,6 @@ extensions/source/ole/unotypewrapper.hxx extensions/source/ole/windata.hxx extensions/source/propctrlr/MasterDetailLinkDialog.cxx extensions/source/propctrlr/MasterDetailLinkDialog.hxx -extensions/source/propctrlr/browserpage.cxx -extensions/source/propctrlr/browserpage.hxx extensions/source/propctrlr/browserview.cxx extensions/source/propctrlr/browserview.hxx extensions/source/propctrlr/buttonnavigationhandler.cxx commit 9e8b484a27ad2c7dd38b879e686f77fb049a13a5 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Jan 20 09:07:10 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jan 22 11:13:42 2026 +0100 propctrlr: Return ptr in OBrowserListBox::impl_getBrowserLineForName Return the shared_ptr instead of having a shared_ptr out param and a bool param saying whether or not the pointer is non-null. Change-Id: I8555db1e807f0196cf37d9c79eb0801ed0eab316 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197628 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index aaeef509d10e..669870d71a8a 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -415,8 +415,7 @@ sal_uInt16 OBrowserListBox::GetPropertyPos(std::u16string_view _rEntryName) cons return EDITOR_LIST_ENTRY_NOTFOUND; } -bool OBrowserListBox::impl_getBrowserLineForName(const OUString& _rEntryName, - BrowserLinePointer& _out_rpLine) const +BrowserLinePointer OBrowserListBox::impl_getBrowserLineForName(const OUString& _rEntryName) const { ListBoxLines::const_iterator line = std::find_if(m_aLines.begin(), m_aLines.end(), [&_rEntryName](const ListBoxLine& rLine) { @@ -424,31 +423,27 @@ bool OBrowserListBox::impl_getBrowserLineForName(const OUString& _rEntryName, }); if (line != m_aLines.end()) - _out_rpLine = line->pLine; - else - _out_rpLine.reset(); - return bool(_out_rpLine); + return line->pLine; + + return {}; } void OBrowserListBox::EnablePropertyControls(const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable) { - BrowserLinePointer pLine; - if (impl_getBrowserLineForName(_rEntryName, pLine)) + if (BrowserLinePointer pLine = impl_getBrowserLineForName(_rEntryName)) pLine->EnablePropertyControls(_nControls, _bEnable); } void OBrowserListBox::EnablePropertyLine(const OUString& _rEntryName, bool _bEnable) { - BrowserLinePointer pLine; - if (impl_getBrowserLineForName(_rEntryName, pLine)) + if (BrowserLinePointer pLine = impl_getBrowserLineForName(_rEntryName)) pLine->EnablePropertyLine(_bEnable); } Reference<XPropertyControl> OBrowserListBox::GetPropertyControl(const OUString& _rEntryName) { - BrowserLinePointer pLine; - if (impl_getBrowserLineForName(_rEntryName, pLine)) + if (BrowserLinePointer pLine = impl_getBrowserLineForName(_rEntryName)) return pLine->getControl(); return nullptr; } diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index bfac638e1ac2..0601e145a2f2 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -145,14 +145,10 @@ private: /** retrieves the ->BrowserLinePointer for a given entry name @param _rEntryName the name whose line is to be looked up - @param _out_rpLine - contains, upon return, the found browser line, if any @return - <TRUE/> if and only if a non-<NULL/> line for the given entry name could be - found. + The Found browser line, if any. */ - bool impl_getBrowserLineForName(const OUString& _rEntryName, - BrowserLinePointer& _out_rpLine) const; + BrowserLinePointer impl_getBrowserLineForName(const OUString& _rEntryName) const; }; } // namespace pcr
