sc/inc/colcontainer.hxx | 2 +- sc/inc/externalrefmgr.hxx | 2 +- sc/inc/scopetools.hxx | 2 +- sc/qa/unit/helper/sorthelper.hxx | 2 +- sc/source/core/data/colcontainer.cxx | 2 +- sc/source/core/tool/scopetools.cxx | 4 ++-- sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx | 2 +- sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 7 ++++++- sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 2 ++ starmath/inc/edit.hxx | 4 +++- starmath/source/edit.cxx | 7 ++++++- starmath/source/tmpdevice.hxx | 2 +- sw/inc/calbck.hxx | 2 +- sw/inc/ndtxt.hxx | 2 ++ sw/inc/node.hxx | 4 ++++ sw/inc/pausethreadstarting.hxx | 4 +++- sw/inc/swddetbl.hxx | 1 + sw/source/core/docnode/ndtbl.cxx | 7 ++++++- sw/source/core/docnode/node.cxx | 7 ++++++- sw/source/core/docnode/pausethreadstarting.cxx | 5 ++++- sw/source/core/fields/ddetbl.cxx | 7 ++++++- sw/source/core/txtnode/ndtxt.cxx | 7 ++++++- 22 files changed, 65 insertions(+), 19 deletions(-)
New commits: commit 6145f19ceebe5f6bb90b9349ba4bae53450bff97 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 22 15:11:07 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 23 17:55:12 2025 +0100 remove some coverity markup Change-Id: I67077fa775225e22ac0fc87bb0b56da11d5ec60a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194395 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx index 13455b5e2c14..896ce5d27959 100644 --- a/sc/inc/colcontainer.hxx +++ b/sc/inc/colcontainer.hxx @@ -31,7 +31,7 @@ public: typedef std::vector<std::unique_ptr<ScColumn, o3tl::default_delete<ScColumn>>> ScColumnVector; ScColContainer( ScSheetLimits const &, const size_t nSize ); - ~ScColContainer() COVERITY_NOEXCEPT_FALSE; + ~ScColContainer(); const ScColumn& operator[] ( const size_t nIndex ) const { diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 5716d15adcc1..815ee77e158d 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -387,7 +387,7 @@ public: { public: LinkListener(); - virtual ~LinkListener() COVERITY_NOEXCEPT_FALSE = 0; + virtual ~LinkListener() = 0; virtual void notify(sal_uInt16 nFileId, LinkUpdateType eType) = 0; }; diff --git a/sc/qa/unit/helper/sorthelper.hxx b/sc/qa/unit/helper/sorthelper.hxx index dc337953fb97..dcf8fcfe4099 100644 --- a/sc/qa/unit/helper/sorthelper.hxx +++ b/sc/qa/unit/helper/sorthelper.hxx @@ -33,7 +33,7 @@ public: mod->SetInputOptions(aInputOptions); return bRet; } - virtual ~SortTypeSetter() COVERITY_NOEXCEPT_FALSE + virtual ~SortTypeSetter() { changeTo(mbSortRefUpdate); } diff --git a/sc/source/core/data/colcontainer.cxx b/sc/source/core/data/colcontainer.cxx index a0a9d845772f..6a160c778b39 100644 --- a/sc/source/core/data/colcontainer.cxx +++ b/sc/source/core/data/colcontainer.cxx @@ -28,7 +28,7 @@ ScColContainer::ScColContainer( ScSheetLimits const & rSheetLimits, const size_t aCols[nCol].reset( new ScColumn(rSheetLimits) ); } -ScColContainer::~ScColContainer() COVERITY_NOEXCEPT_FALSE +ScColContainer::~ScColContainer() { Clear(); } diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index a582ffa72e55..f613328b4e93 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -37,7 +37,7 @@ namespace sd class SdGlobalResource { public: - virtual ~SdGlobalResource() COVERITY_NOEXCEPT_FALSE{}; + virtual ~SdGlobalResource() {} }; /** The purpose of this container is to hold references to resources that diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index a86911f34e9b..c242811da496 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -127,7 +127,7 @@ namespace sw WriterListener() : m_pLeft(nullptr), m_pRight(nullptr) {} - virtual ~WriterListener() COVERITY_NOEXCEPT_FALSE {} + virtual ~WriterListener() {} virtual void SwClientNotify( const SwModify&, const SfxHint& rHint) =0; public: bool IsLast() const { return !m_pLeft && !m_pRight; } commit c2d149357cf1152f64a884c1541e0fe09be7f7cc Author: Caolán McNamara <[email protected]> AuthorDate: Sun Nov 23 14:46:20 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 23 17:55:06 2025 +0100 cid#1660226 silence Uncaught exception and cid#1659881 Uncaught exception cid#1482285 Uncaught exception cid#1448465 Uncaught exception cid#1421098 Uncaught exception cid#1421084 Uncaught exception cid#1400542 Uncaught exception cid#1399276 Uncaught exception cid#1399221 Uncaught exception cid#1399212 Uncaught exception Change-Id: I448e698047a6d2db7b0ac7575a54473fc5e88cc9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194394 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx index 7c0f32e9fee2..ebfbc8cb21a9 100644 --- a/sc/inc/scopetools.hxx +++ b/sc/inc/scopetools.hxx @@ -72,7 +72,7 @@ class DelayFormulaGroupingSwitch public: DelayFormulaGroupingSwitch(ScDocument& rDoc, bool delay); - ~DelayFormulaGroupingSwitch() COVERITY_NOEXCEPT_FALSE; + ~DelayFormulaGroupingSwitch(); void reset(); }; diff --git a/sc/source/core/tool/scopetools.cxx b/sc/source/core/tool/scopetools.cxx index 15d94040e09b..951fae39683b 100644 --- a/sc/source/core/tool/scopetools.cxx +++ b/sc/source/core/tool/scopetools.cxx @@ -64,9 +64,9 @@ DelayFormulaGroupingSwitch::DelayFormulaGroupingSwitch(ScDocument& rDoc, bool de mrDoc.DelayFormulaGrouping(delay); } -DelayFormulaGroupingSwitch::~DelayFormulaGroupingSwitch() COVERITY_NOEXCEPT_FALSE +DelayFormulaGroupingSwitch::~DelayFormulaGroupingSwitch() { - mrDoc.DelayFormulaGrouping(mbOldValue); + suppress_fun_call_w_exception(mrDoc.DelayFormulaGrouping(mbOldValue)); } void DelayFormulaGroupingSwitch::reset() diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 25d5d29a248a..05332677bc38 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -83,7 +83,7 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages() { } -RecentlyUsedMasterPages::~RecentlyUsedMasterPages() +void RecentlyUsedMasterPages::ImplDestroy() { Link<MasterPageContainerChangeEvent&,void> aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->RemoveChangeListener(aLink); @@ -92,6 +92,11 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages() LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } +RecentlyUsedMasterPages::~RecentlyUsedMasterPages() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} + void RecentlyUsedMasterPages::LateInit() { Link<MasterPageContainerChangeEvent&,void> aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index 7172df6b8660..5ed944c058a1 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -119,6 +119,8 @@ private: void SavePersistentValues(); void ResolveList(); + + void ImplDestroy(); }; } // end of namespace sd::sidebar diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index bcf3069209ab..e3d06eb59378 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -86,9 +86,11 @@ class SmEditWindow final void CreateEditView(weld::Builder& rBuilder); + void ImplDestroy(); + public: SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin, weld::Builder& rBuilder); - ~SmEditWindow() COVERITY_NOEXCEPT_FALSE; + ~SmEditWindow(); weld::Window* GetFrameWeld() const; diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index a2a6f377d3c2..047c7b86949e 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -143,12 +143,17 @@ SmEditWindow::SmEditWindow(SmCmdBoxWindow &rMyCmdBoxWin, weld::Builder& rBuilder CreateEditView(rBuilder); } -SmEditWindow::~SmEditWindow() COVERITY_NOEXCEPT_FALSE +void SmEditWindow::ImplDestroy() { DeleteEditView(); mxScrolledWindow.reset(); } +SmEditWindow::~SmEditWindow() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} + weld::Window* SmEditWindow::GetFrameWeld() const { return rCmdBox.GetFrameWeld(); diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx index 9c15fe035793..98ea6d697744 100644 --- a/starmath/source/tmpdevice.hxx +++ b/starmath/source/tmpdevice.hxx @@ -33,7 +33,7 @@ class SmTmpDevice public: SmTmpDevice(OutputDevice& rTheDev, bool bUseMap100th_mm); - ~SmTmpDevice() COVERITY_NOEXCEPT_FALSE { rOutDev.Pop(); } + ~SmTmpDevice() { suppress_fun_call_w_exception(rOutDev.Pop()); } void SetFont(const vcl::Font& rNewFont); diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 247682b260ba..dcbe11e4b7d6 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -211,6 +211,8 @@ class SW_DLLPUBLIC SwTextNode final void DelFrames_TextNodePart(); void HandleNonLegacyHint(const SfxHint&); + SAL_DLLPRIVATE void ImplDestroy(); + public: bool IsWordCountDirty() const; sw::WrongState GetWrongDirty() const; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 2e481d794d93..28d706a7b700 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -530,6 +530,8 @@ public: private: SwContentNode( const SwContentNode & rNode ) = delete; SwContentNode & operator= ( const SwContentNode & rNode ) = delete; + + void ImplDestroy(); }; // SwTableNode @@ -539,6 +541,8 @@ class SW_DLLPUBLIC SwTableNode final : public SwStartNode, public sw::Broadcasti friend class SwNodes; std::unique_ptr<SwTable> m_pTable; + void ImplDestroy(); + virtual ~SwTableNode() override; public: diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx index f3fc2bf7d4df..2c2a89c40444 100644 --- a/sw/inc/pausethreadstarting.hxx +++ b/sw/inc/pausethreadstarting.hxx @@ -30,10 +30,12 @@ class SwPauseThreadStarting { public: SwPauseThreadStarting(); - ~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE; + ~SwPauseThreadStarting(); private: bool mbPausedThreadStarting; + + void ImplDestroy(); }; #endif diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index efe956662583..e1e117a6d38e 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -42,6 +42,7 @@ public: private: virtual void SwClientNotify(const SwModify&, const SfxHint&) override; + void ImplDestroy(); }; inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 7f0007450cd7..953dd1b72d96 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2455,7 +2455,7 @@ SwTableNode::SwTableNode( const SwNode& rWhere ) m_pTable.reset(new SwTable); } -SwTableNode::~SwTableNode() +void SwTableNode::ImplDestroy() { // Notify UNO wrappers GetTable().GetFrameFormat()->GetNotifier().Broadcast(SfxHint(SfxHintId::Dying)); @@ -2464,6 +2464,11 @@ SwTableNode::~SwTableNode() m_pTable.reset(); } +SwTableNode::~SwTableNode() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} + SwTabFrame *SwTableNode::MakeFrame( SwFrame* pSib ) { return new SwTabFrame( *m_pTable, pSib ); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 7c8f16bc751a..f42e96e9519c 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1083,7 +1083,7 @@ SwContentNode::SwContentNode( const SwNode& rWhere, const SwNodeType nNdType, pColl->Add(*this); } -SwContentNode::~SwContentNode() +void SwContentNode::ImplDestroy() { // The base class SwClient of SwFrame excludes itself from the dependency list! // Thus, we need to delete all Frames in the dependency list. @@ -1100,6 +1100,11 @@ SwContentNode::~SwContentNode() InvalidateInSwCache(); } +SwContentNode::~SwContentNode() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} + void SwContentNode::UpdateAttr(const SwUpdateAttr& rUpdate) { if (GetNodes().IsDocNodes() diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx index 953bd3a3f8fd..1b2f45ba631a 100644 --- a/sw/source/core/docnode/pausethreadstarting.cxx +++ b/sw/source/core/docnode/pausethreadstarting.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <o3tl/deleter.hxx> #include <pausethreadstarting.hxx> #include <swthreadmanager.hxx> @@ -37,7 +38,7 @@ SwPauseThreadStarting::SwPauseThreadStarting() } } -SwPauseThreadStarting::~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE +void SwPauseThreadStarting::ImplDestroy() { if (mbPausedThreadStarting) { @@ -45,4 +46,6 @@ SwPauseThreadStarting::~SwPauseThreadStarting() COVERITY_NOEXCEPT_FALSE } } +SwPauseThreadStarting::~SwPauseThreadStarting() { suppress_fun_call_w_exception(ImplDestroy()); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx index 75539d48cc49..5058d05134a6 100644 --- a/sw/source/core/fields/ddetbl.cxx +++ b/sw/source/core/fields/ddetbl.cxx @@ -62,7 +62,7 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, bool bUpdate } } -SwDDETable::~SwDDETable() +void SwDDETable::ImplDestroy() { SwDoc& rDoc = GetFrameFormat()->GetDoc(); if (!rDoc.IsInDtor() && !m_aLines.empty()) @@ -83,6 +83,11 @@ SwDDETable::~SwDDETable() } } +SwDDETable::~SwDDETable() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} + void SwDDETable::SwClientNotify(const SwModify& rModify, const SfxHint& rHint) { if (rHint.GetId() == SfxHintId::SwLegacyModify diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 759f97c772e2..ca251a16a02a 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -247,7 +247,7 @@ SwTextNode::SwTextNode( const SwNode& rWhere, SwTextFormatColl *pTextColl, const m_bRecalcHiddenCharFlags = true; } -SwTextNode::~SwTextNode() +void SwTextNode::ImplDestroy() { // delete only removes the pointer not the array elements! if ( m_pSwpHints ) @@ -291,6 +291,11 @@ SwTextNode::~SwTextNode() InvalidateInSwCache(); } +SwTextNode::~SwTextNode() +{ + suppress_fun_call_w_exception(ImplDestroy()); +} + void SwTextNode::FileLoadedInitHints() { if (m_pSwpHints)
