From d0069e5189f5410e1db7aa395f0754109e872f46 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 10 Feb 2017 09:24:16 +0000 Subject: add COVERITY_NOEXCEPT_FALSE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to markup dtors that coverity warns might throw exceptions which won't throw in practice, or where std::terminate is an acceptable response if they do Change-Id: I32b94814e8245372e1d1dc36be0d81e3564042f4 Reviewed-on: https://gerrit.libreoffice.org/38318 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/inc/calbck.hxx | 2 +- sw/inc/editsh.hxx | 4 ++-- sw/inc/ndole.hxx | 2 +- sw/inc/ring.hxx | 2 +- sw/inc/unobaseclass.hxx | 2 +- sw/inc/unochart.hxx | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index a6f07772c045..bfae004e9e57 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -86,7 +86,7 @@ namespace sw WriterListener() : m_pLeft(nullptr), m_pRight(nullptr) {} - virtual ~WriterListener() {}; + virtual ~WriterListener() COVERITY_NOEXCEPT_FALSE {} virtual void SwClientNotify( const SwModify&, const SfxHint& rHint) =0; public: bool IsLast() const { return !m_pLeft && !m_pRight; } diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 6f3669a95ba1..1bc5c1b0eec5 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -962,7 +962,7 @@ class SwActContext { SwEditShell & m_rShell; public: SwActContext(SwEditShell *pShell); - ~SwActContext(); + ~SwActContext() COVERITY_NOEXCEPT_FALSE; }; /// Class for automated call of Start- and EndCursorMove(). @@ -970,7 +970,7 @@ class SwMvContext { SwEditShell & m_rShell; public: SwMvContext(SwEditShell *pShell); - ~SwMvContext(); + ~SwMvContext() COVERITY_NOEXCEPT_FALSE; }; #endif diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index c878689b78eb..86e0798a5697 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwOLEObj public: SwOLEObj( const svt::EmbeddedObjectRef& pObj ); SwOLEObj( const OUString &rName, sal_Int64 nAspect ); - ~SwOLEObj(); + ~SwOLEObj() COVERITY_NOEXCEPT_FALSE; bool UnloadObject(); static bool UnloadObject( css::uno::Reference< css::embed::XEmbeddedObject > const & xObj, diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx index a03db4c68cee..79a1c93fb82d 100644 --- a/sw/inc/ring.hxx +++ b/sw/inc/ring.hxx @@ -42,7 +42,7 @@ namespace sw typedef typename std::add_const::type const_value_type; typedef RingContainer ring_container; typedef RingContainer const_ring_container; - virtual ~Ring() + virtual ~Ring() COVERITY_NOEXCEPT_FALSE { unlink(); }; /** algo::unlink is buggy! don't call it directly! */ void unlink() diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index f72f07d5c83a..d03a5dd37ca5 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -66,7 +66,7 @@ private: public: UnoActionContext(SwDoc *const pDoc); - ~UnoActionContext(); + ~UnoActionContext() COVERITY_NOEXCEPT_FALSE; }; /* diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 38e3b34e6a2c..6b57b32ac708 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -87,7 +87,7 @@ class SwChartLockController_Helper public: SwChartLockController_Helper( SwDoc *pDocument ); - ~SwChartLockController_Helper(); + ~SwChartLockController_Helper() COVERITY_NOEXCEPT_FALSE; void StartOrContinueLocking(); void Disconnect(); -- cgit