From 5280b3eaa6e9a9ee5994c1459f459336908fc741 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 17 Nov 2017 12:23:26 +0000 Subject: silence some coverity warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5a530e37156b5cd36e8a07ac20851880a46f520d Reviewed-on: https://gerrit.libreoffice.org/44875 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/dlged/dlgedfac.cxx | 2 +- basctl/source/inc/dlgedfac.hxx | 2 +- basic/source/inc/iosys.hxx | 2 +- basic/source/runtime/iosys.cxx | 2 +- connectivity/source/drivers/jdbc/Object.cxx | 2 +- connectivity/source/inc/java/GlobalRef.hxx | 2 +- connectivity/source/inc/java/lang/Object.hxx | 2 +- cui/source/dialogs/hangulhanjadlg.cxx | 4 ++-- emfio/inc/mtftools.hxx | 2 +- emfio/source/reader/mtftools.cxx | 2 +- include/comphelper/unique_disposing_ptr.hxx | 2 +- include/vcl/dndhelp.hxx | 2 +- include/vcl/scopedbitmapaccess.hxx | 2 +- .../ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx | 2 +- .../slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx | 2 +- sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx | 2 +- sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 2 +- starmath/source/tmpdevice.hxx | 2 +- sw/inc/undobj.hxx | 2 +- sw/qa/extras/uiwriter/uiwriter.cxx | 3 ++- sw/source/core/txtnode/ndtxt.cxx | 8 ++++---- sw/source/core/undo/undobj.cxx | 2 +- sw/source/filter/ww8/ww8par.hxx | 2 +- sw/source/filter/ww8/ww8par3.cxx | 2 +- vcl/inc/textlayout.hxx | 2 +- vcl/source/app/dndhelp.cxx | 2 +- 26 files changed, 31 insertions(+), 30 deletions(-) diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index b94470d83fe5..8e9ba230d6e8 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -37,7 +37,7 @@ DlgEdFactory::DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xMo } -DlgEdFactory::~DlgEdFactory() +DlgEdFactory::~DlgEdFactory() COVERITY_NOEXCEPT_FALSE { SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx index 60bc4418ff8c..441b66336872 100644 --- a/basctl/source/inc/dlgedfac.hxx +++ b/basctl/source/inc/dlgedfac.hxx @@ -36,7 +36,7 @@ class DlgEdFactory const css::uno::Reference< css::frame::XModel > mxModel; public: DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ); - ~DlgEdFactory(); + ~DlgEdFactory() COVERITY_NOEXCEPT_FALSE; DECL_LINK( MakeObject, SdrObjCreatorParams, SdrObject* ); }; diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 4bed2e20160c..7d7e9e832633 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -91,7 +91,7 @@ class SbiIoSystem void WriteCon(const OUString&); public: SbiIoSystem(); - ~SbiIoSystem(); + ~SbiIoSystem() COVERITY_NOEXCEPT_FALSE; ErrCode GetError(); void Shutdown(); void SetPrompt(const OString& r) { aPrompt = r; } diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index e8f4185c5bcf..4c625a749284 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -644,7 +644,7 @@ SbiIoSystem::SbiIoSystem() nError = ERRCODE_NONE; } -SbiIoSystem::~SbiIoSystem() +SbiIoSystem::~SbiIoSystem() COVERITY_NOEXCEPT_FALSE { Shutdown(); } diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index b8560ab99c1b..06ee354903c9 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -114,7 +114,7 @@ java_lang_Object::java_lang_Object( JNIEnv * pXEnv, jobject myObj ) object = pXEnv->NewGlobalRef( myObj ); } -java_lang_Object::~java_lang_Object() +java_lang_Object::~java_lang_Object() COVERITY_NOEXCEPT_FALSE { if( object ) { diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 277cfa2dec1e..6ff20ce4c0e2 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -55,7 +55,7 @@ namespace connectivity { namespace jdbc return *this; } - ~GlobalRef() + ~GlobalRef() COVERITY_NOEXCEPT_FALSE { reset(); } diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index f7d136ceacc0..0c8ff2ef1047 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -86,7 +86,7 @@ namespace connectivity // The actual ctor java_lang_Object(); - virtual ~java_lang_Object(); + virtual ~java_lang_Object() COVERITY_NOEXCEPT_FALSE; void saveRef( JNIEnv * pEnv, jobject myObj ); jobject getJavaObject() const { return object; } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 0fcc1fc1e17b..2557538a83c3 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -71,9 +71,9 @@ namespace svx m_rDev.Push( PushFlags::FONT ); m_rDev.SetFont( _rTemporaryFont ); } - ~FontSwitch( ) + ~FontSwitch() COVERITY_NOEXCEPT_FALSE { - m_rDev.Pop( ); + m_rDev.Pop(); } }; } diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index dcc227a9240f..9d8efc8a0a51 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -651,7 +651,7 @@ namespace emfio Color ReadColor(); explicit MtfTools(GDIMetaFile& rGDIMetaFile, SvStream& rStreamWMF); - ~MtfTools(); + ~MtfTools() COVERITY_NOEXCEPT_FALSE; }; } diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 24222eb2d0fe..fc37c8c6ac9a 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -908,7 +908,7 @@ namespace emfio mpGDIMetaFile->AddAction( new MetaRasterOpAction( RasterOp::OverPaint ) ); } - MtfTools::~MtfTools() + MtfTools::~MtfTools() COVERITY_NOEXCEPT_FALSE { mpGDIMetaFile->AddAction( new MetaPopAction() ); mpGDIMetaFile->SetPrefMapMode(MapMode(MapUnit::Map100thMM)); diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx index 395398f3965f..8434a1e916b3 100644 --- a/include/comphelper/unique_disposing_ptr.hxx +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -62,7 +62,7 @@ public: return static_cast< bool >(m_xItem); } - virtual ~unique_disposing_ptr() + virtual ~unique_disposing_ptr() COVERITY_NOEXCEPT_FALSE { reset(); } diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 57c941c2b8d0..20b09c3ecbb9 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -53,7 +53,7 @@ namespace unohelper class VCL_DLLPUBLIC DragAndDropClient { public: - virtual ~DragAndDropClient(); + virtual ~DragAndDropClient() COVERITY_NOEXCEPT_FALSE; // css::datatransfer::dnd::XDragGestureListener /// @throws css::uno::RuntimeException diff --git a/include/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx index 29941368f340..05eb39587bac 100644 --- a/include/vcl/scopedbitmapaccess.hxx +++ b/include/vcl/scopedbitmapaccess.hxx @@ -82,7 +82,7 @@ public: ScopedBitmapAccess(const ScopedBitmapAccess&) = delete; ScopedBitmapAccess &operator=(const ScopedBitmapAccess&) = delete; - ~ScopedBitmapAccess() + ~ScopedBitmapAccess() COVERITY_NOEXCEPT_FALSE { if (mpAccess) mpBitmap->ReleaseAccess( mpAccess ); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index 250c7e68bcc6..323dbe948fe9 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -47,7 +47,7 @@ InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) { } -InsertionIndicatorHandler::~InsertionIndicatorHandler() +InsertionIndicatorHandler::~InsertionIndicatorHandler() COVERITY_NOEXCEPT_FALSE { } diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index 6c6f9e2d621e..ef1076e99a1d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -42,7 +42,7 @@ class InsertionIndicatorHandler { public: InsertionIndicatorHandler (SlideSorter& rSlideSorter); - ~InsertionIndicatorHandler(); + ~InsertionIndicatorHandler() COVERITY_NOEXCEPT_FALSE; enum Mode { CopyMode, MoveMode, UnknownMode }; static Mode GetModeFromDndAction (const sal_Int8 nDndAction); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx index 457f18422724..f0dad8bb2b07 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx @@ -57,7 +57,7 @@ public: { public: Context (SlideSorter const & rSlideSorter); - ~Context(); + ~Context() COVERITY_NOEXCEPT_FALSE; void Abort(); private: std::shared_ptr mpSelectionObserver; diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 780badf97fdb..0d39186e6a28 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -45,7 +45,7 @@ public: virtual VclPtr GetContentWindow (void) = 0; protected: - ~AnimatorAccess() {} + ~AnimatorAccess() COVERITY_NOEXCEPT_FALSE {} }; /** Controller of the position offsets of all page objects in one row or one diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx index 4cadfa69176c..f03aa9d42bb3 100644 --- a/starmath/source/tmpdevice.hxx +++ b/starmath/source/tmpdevice.hxx @@ -34,7 +34,7 @@ class SmTmpDevice public: SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm); - ~SmTmpDevice() { rOutDev.Pop(); } + ~SmTmpDevice() COVERITY_NOEXCEPT_FALSE { rOutDev.Pop(); } void SetFont(const vcl::Font &rNewFont); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index b413bfd5b25b..f71f8873e1e1 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -179,7 +179,7 @@ protected: public: SwUndoSaveContent(); - ~SwUndoSaveContent(); + ~SwUndoSaveContent() COVERITY_NOEXCEPT_FALSE; }; // Save a complete section in nodes-array. diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 7b09d0a35cab..0504bbc27b59 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -89,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -833,7 +834,7 @@ void SwUiWriterTest::testExportRTF() pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, /*bBasicCall=*/false); // Create the clipboard document. - std::shared_ptr xClpDoc(new SwDoc()); + std::shared_ptr xClpDoc(new SwDoc, o3tl::default_delete()); xClpDoc->SetClipBoard(true); pWrtShell->Copy(xClpDoc.get()); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 2596f115e9e5..297f307d8d04 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -4210,7 +4210,7 @@ namespace { const SfxPoolItem& pItem ); HandleSetAttrAtTextNode( SwTextNode& rTextNode, const SfxItemSet& rItemSet ); - ~HandleSetAttrAtTextNode(); + ~HandleSetAttrAtTextNode() COVERITY_NOEXCEPT_FALSE; private: SwTextNode& mrTextNode; @@ -4440,7 +4440,7 @@ namespace { } } - HandleSetAttrAtTextNode::~HandleSetAttrAtTextNode() + HandleSetAttrAtTextNode::~HandleSetAttrAtTextNode() COVERITY_NOEXCEPT_FALSE { if ( mbAddTextNodeToList ) { @@ -4549,7 +4549,7 @@ namespace { const std::vector& rWhichArr ); explicit HandleResetAttrAtTextNode( SwTextNode& rTextNode ); - ~HandleResetAttrAtTextNode(); + ~HandleResetAttrAtTextNode() COVERITY_NOEXCEPT_FALSE; private: SwTextNode& mrTextNode; @@ -4737,7 +4737,7 @@ namespace { mrTextNode.ResetEmptyListStyleDueToResetOutlineLevelAttr(); } - HandleResetAttrAtTextNode::~HandleResetAttrAtTextNode() + HandleResetAttrAtTextNode::~HandleResetAttrAtTextNode() COVERITY_NOEXCEPT_FALSE { if ( mbListStyleOrIdReset && !mrTextNode.IsInList() ) { diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 51941c8f3ea8..65717add205e 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -692,7 +692,7 @@ SwUndoSaveContent::SwUndoSaveContent() : pHistory( nullptr ) {} -SwUndoSaveContent::~SwUndoSaveContent() +SwUndoSaveContent::~SwUndoSaveContent() COVERITY_NOEXCEPT_FALSE { } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index b5bed2270818..637aac0c120d 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -152,7 +152,7 @@ public: SwNumRule* GetNumRuleForActivation(sal_uInt16 nLFOPosition, const sal_uInt8 nLevel, std::vector &rParaSprms, SwTextNode *pNode=nullptr); SwNumRule* CreateNextRule(bool bSimple); - ~WW8ListManager(); + ~WW8ListManager() COVERITY_NOEXCEPT_FALSE; SwNumRule* GetNumRule(size_t i); size_t GetWW8LSTInfoNum() const{return maLSTInfos.size();} private: diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index cf6f5555b6fc..d82801072abc 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1458,7 +1458,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) rSt.Seek( nOriginalPos ); } -WW8ListManager::~WW8ListManager() +WW8ListManager::~WW8ListManager() COVERITY_NOEXCEPT_FALSE { /* named lists remain in document diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index ae478847c2dc..16e54c61d3bb 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -37,7 +37,7 @@ namespace vcl virtual bool DecomposeTextRectAction() const = 0; protected: - ~ITextLayout() {} + ~ITextLayout() COVERITY_NOEXCEPT_FALSE {} }; /** is an implementation of the ITextLayout interface which simply delegates its calls to the respective diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index dc686c1f759e..ff4beb7898b8 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; -vcl::unohelper::DragAndDropClient::~DragAndDropClient() {} +vcl::unohelper::DragAndDropClient::~DragAndDropClient() COVERITY_NOEXCEPT_FALSE {} void vcl::unohelper::DragAndDropClient::dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& /*dge*/ ) { -- cgit