include/vcl/embeddedfontsmanager.hxx | 2 +- reportdesign/source/ui/inc/dlgedfac.hxx | 2 +- reportdesign/source/ui/report/dlgedfac.cxx | 2 +- sw/source/filter/md/wrtmd.cxx | 5 +++-- vcl/inc/unx/salgdi.h | 2 +- vcl/inc/window.h | 2 +- vcl/source/gdi/embeddedfontsmanager.cxx | 2 +- vcl/source/window/paint.cxx | 2 +- vcl/unx/generic/gdi/salgdi.cxx | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-)
New commits: commit a8b182c9045973d45909a421e51e0b76e627be74 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Oct 2 08:41:03 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 5 12:23:48 2025 +0200 drop some more COVERITY stuff Change-Id: I7c71aafd198634b545ca3df23eb24d8adec4544a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191762 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/embeddedfontsmanager.hxx b/include/vcl/embeddedfontsmanager.hxx index d0338aa26545..ecf152827d91 100644 --- a/include/vcl/embeddedfontsmanager.hxx +++ b/include/vcl/embeddedfontsmanager.hxx @@ -108,7 +108,7 @@ public: static void releaseFonts(const std::vector<std::pair<OUString, OUString>>& fonts); EmbeddedFontsManager(const css::uno::Reference<css::frame::XModel>& xModel); - ~EmbeddedFontsManager() COVERITY_NOEXCEPT_FALSE; + ~EmbeddedFontsManager(); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index f98d9f9a4ee0..339aef861f71 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -31,7 +31,7 @@ class DlgEdFactory { public: DlgEdFactory(); - ~DlgEdFactory() COVERITY_NOEXCEPT_FALSE; + ~DlgEdFactory(); DECL_STATIC_LINK(DlgEdFactory, MakeObject, SdrObjCreatorParams, rtl::Reference<SdrObject>); }; diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index d529f4c4f3fb..e5fe2e741427 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -33,7 +33,7 @@ DlgEdFactory::DlgEdFactory() } -DlgEdFactory::~DlgEdFactory() COVERITY_NOEXCEPT_FALSE +DlgEdFactory::~DlgEdFactory() { SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 81e6fa317911..a03c5a64574d 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -66,7 +66,7 @@ class X11SalGraphics final : public SalGraphicsAutoDelegateToImpl public: X11SalGraphics(); - virtual ~X11SalGraphics() COVERITY_NOEXCEPT_FALSE override; + virtual ~X11SalGraphics() override; void Init(X11SalFrame& rFrame, Drawable aDrawable, SalX11Screen nXScreen); void Init(X11SalVirtualDevice *pVirtualDevice, SalColormap* pColormap = nullptr, diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 1fd18186ac71..3173eac28712 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -417,7 +417,7 @@ class VCL_DLLPUBLIC PaintBufferGuard tools::Rectangle m_aPaintRect; public: PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow); - ~PaintBufferGuard() COVERITY_NOEXCEPT_FALSE; + ~PaintBufferGuard(); /// If this is called, then the dtor will also copy rRectangle to the window from the buffer, before restoring the state. void SetPaintRect(const tools::Rectangle& rRectangle); /// Returns either the frame's buffer or the window, in case of no buffering. diff --git a/vcl/source/gdi/embeddedfontsmanager.cxx b/vcl/source/gdi/embeddedfontsmanager.cxx index 2281cc546e17..e4817bef4e17 100644 --- a/vcl/source/gdi/embeddedfontsmanager.cxx +++ b/vcl/source/gdi/embeddedfontsmanager.cxx @@ -251,7 +251,7 @@ EmbeddedFontsManager::EmbeddedFontsManager(const uno::Reference<frame::XModel>& { } -EmbeddedFontsManager::~EmbeddedFontsManager() COVERITY_NOEXCEPT_FALSE +EmbeddedFontsManager::~EmbeddedFontsManager() { if (m_aAccumulatedFonts.empty()) return; diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index e01a1cc0ddfd..a6df7a30f36c 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -109,7 +109,7 @@ PaintBufferGuard::PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWind pFrameData->mpBuffer->EnableRTL(pWindow->IsRTLEnabled()); } -PaintBufferGuard::~PaintBufferGuard() COVERITY_NOEXCEPT_FALSE +PaintBufferGuard::~PaintBufferGuard() { if (!mpFrameData->mpBuffer) return; diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index a9f0a3c0cbb8..cd3c591cf5d6 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -86,7 +86,7 @@ X11SalGraphics::X11SalGraphics(): } } -X11SalGraphics::~X11SalGraphics() COVERITY_NOEXCEPT_FALSE +X11SalGraphics::~X11SalGraphics() { mxImpl->DeInit(); SetDrawable(None, nullptr, m_nXScreen); commit 6716ac27d15749eb22d6884299536b895caf0284 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Oct 4 20:38:52 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Oct 5 12:23:37 2025 +0200 cid#1666494 silence Overflowed constant Change-Id: I353c5fc0c887c7dcc37b82a7624a8c743f5f3792 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191864 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sw/source/filter/md/wrtmd.cxx b/sw/source/filter/md/wrtmd.cxx index 07329dfef96c..34164d3f3d19 100644 --- a/sw/source/filter/md/wrtmd.cxx +++ b/sw/source/filter/md/wrtmd.cxx @@ -802,11 +802,13 @@ void OutMarkdown_SwTextNode(SwMDWriter& rWrt, const SwTextNode& rNode, bool bFir positions.redlineEnds.sort(); // Collect flys anchored to this text node. - for (size_t nFly = 0; nFly < rWrt.GetFlys().size(); ++nFly) + size_t nFly = 0; + while (nFly < rWrt.GetFlys().size()) { const SwMDFly& rFly = rWrt.GetFlys()[nFly]; if (rFly.m_nAnchorNodeOffset < rNode.GetIndex()) { + ++nFly; continue; } if (rFly.m_nAnchorNodeOffset > rNode.GetIndex()) @@ -815,7 +817,6 @@ void OutMarkdown_SwTextNode(SwMDWriter& rWrt, const SwTextNode& rNode, bool bFir } SwMDFly aFly = rWrt.GetFlys().erase_extract(nFly); - --nFly; positions.flys.add(aFly.m_nAnchorContentOffset, aFly.m_pFrameFormat); }
