sc/source/core/inc/bcaslot.hxx | 10 +++++++--- sc/source/ui/inc/anyrefdg.hxx | 2 +- sc/source/ui/miscdlgs/anyrefdg.cxx | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit ce0be04fbc8b355bb6bb7123adf9ffe616ebb961 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Nov 30 10:29:23 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 30 16:20:10 2025 +0100 cid#1399336 Uncaught exception Change-Id: I52e1617821c8a253df75b7faf6df9e990fb7c18d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194832 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 0d424e123f77..a530efa42a92 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -101,7 +101,7 @@ protected: public: ScRefHandler(SfxDialogController &rController, SfxBindings* pB, bool bBindRef); - virtual ~ScRefHandler() COVERITY_NOEXCEPT_FALSE override; + virtual ~ScRefHandler() override; virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override = 0; virtual void AddRefEntry() override; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 1ac346539d41..300d115538f6 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -634,9 +634,9 @@ bool ScRefHandler::EnterRefMode() return m_bInRefMode; } -ScRefHandler::~ScRefHandler() COVERITY_NOEXCEPT_FALSE +ScRefHandler::~ScRefHandler() { - disposeRefHandler(); + suppress_fun_call_w_exception(disposeRefHandler()); } void ScRefHandler::disposeRefHandler() commit 0ff4c259b2fd8781d9b5451742457fce5ec87fc8 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Nov 30 10:28:03 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 30 16:20:04 2025 +0100 cid#1399299 Uncaught exception and cid#1660449 Uncaught exception Change-Id: Iecec1cde88aaacc4640ab9daa6784aaf2d7e2a4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194831 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index c91db7678a7e..eb6f150103ad 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -380,6 +380,11 @@ class ScBulkBroadcast ScBulkBroadcast & operator =(ScBulkBroadcast const &) = delete; ScBulkBroadcast & operator =(ScBulkBroadcast &&) = delete; + void ImplDestroy() + { + if (pBASM) + pBASM->LeaveBulkBroadcast( mnHintId ); + } public: explicit ScBulkBroadcast( ScBroadcastAreaSlotMachine* p, SfxHintId nHintId ) : pBASM(p), @@ -388,10 +393,9 @@ public: if (pBASM) pBASM->EnterBulkBroadcast(); } - ~ScBulkBroadcast() COVERITY_NOEXCEPT_FALSE + ~ScBulkBroadcast() { - if (pBASM) - pBASM->LeaveBulkBroadcast( mnHintId ); + suppress_fun_call_w_exception(ImplDestroy()); } };
