extensions/source/propctrlr/browserlistbox.cxx | 5 ++++- extensions/source/propctrlr/browserlistbox.hxx | 2 ++ extensions/source/propctrlr/browserpage.cxx | 5 +---- extensions/source/propctrlr/browserpage.hxx | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 7bfc87359391243501e4c63141a0bd8ac4a8ef38 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jan 26 19:46:26 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Jan 26 22:27:24 2026 +0100 cid#1680644 Uncaught exception and cid#1401474 Uncaught exception Change-Id: I91b2d4e8e6471b39d5c1d7f67025073399b66750 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198167 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index e66dec6f3c91..420faeb663c8 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/inspection/PropertyControlType.hpp> +#include <o3tl/deleter.hxx> #include <tools/debug.hxx> #include <comphelper/diagnose_ex.hxx> #include <comphelper/asyncnotification.hxx> @@ -307,7 +308,7 @@ OBrowserListBox::OBrowserListBox(weld::Builder& rBuilder, weld::Container* pCont m_xScrolledWindow->set_size_request(-1, m_xScrolledWindow->get_text_height() * 20); } -OBrowserListBox::~OBrowserListBox() +void OBrowserListBox::ImplDestroy() { OSL_ENSURE( !IsModified(), @@ -322,6 +323,8 @@ OBrowserListBox::~OBrowserListBox() Clear(); } +OBrowserListBox::~OBrowserListBox() { suppress_fun_call_w_exception(ImplDestroy()); } + bool OBrowserListBox::IsModified() const { bool bModified = false; diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 2246c964d3e0..a4bfc225002c 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -78,6 +78,8 @@ class OBrowserListBox final : public IButtonClickListener void UpdatePlayGround(); void ShowEntry(sal_uInt16 nPos); + void ImplDestroy(); + public: explicit OBrowserListBox(weld::Builder& rBuilder, weld::Container* pContainer); ~OBrowserListBox(); diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index b2c4b6f95333..b902802f8cc9 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <o3tl/deleter.hxx> #include <vcl/svapp.hxx> #include "browserpage.hxx" @@ -31,14 +30,12 @@ OBrowserPage::OBrowserPage(weld::Container* pParent, weld::Container* pInitialCo { } -void OBrowserPage::ImplDestroy() +OBrowserPage::~OBrowserPage() { if (m_pParent) detach(); assert(!m_pParent); } - -OBrowserPage::~OBrowserPage() { suppress_fun_call_w_exception(ImplDestroy()); } } // namespace pcr /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 82553367cc93..5595b4bbe67f 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -32,8 +32,6 @@ private: std::unique_ptr<weld::Container> m_xContainer; OBrowserListBox m_aBrowserListBox; - void ImplDestroy(); - public: // TODO inherit from BuilderPage explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer);
