reportdesign/source/ui/inc/dlgedfac.hxx | 3 +++ reportdesign/source/ui/report/dlgedfac.cxx | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit 4b53fc804bb1d959a3535a4c3c49075667405071 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Oct 4 20:34:16 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 5 12:23:57 2025 +0200 cid#1421074 Uncaught exception Change-Id: Ied89b9be9e6914397b6f0a2c5f12fb6ab7f8633a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191863 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index 339aef861f71..04001893dc19 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -29,6 +29,9 @@ namespace rptui class DlgEdFactory { +private: + void ImplDestroy(); + public: DlgEdFactory(); ~DlgEdFactory(); diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index e5fe2e741427..f04547f27241 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -26,18 +26,20 @@ namespace rptui { using namespace ::com::sun::star; - DlgEdFactory::DlgEdFactory() { SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } - -DlgEdFactory::~DlgEdFactory() +void DlgEdFactory::ImplDestroy() { SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } +DlgEdFactory::~DlgEdFactory() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} IMPL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, rtl::Reference<SdrObject> )
