[Libreoffice-commits] core.git: sw/inc sw/source

Caolán McNamara caolanm at redhat.com
Thu May 24 08:08:05 UTC 2018


 sw/inc/unobaseclass.hxx            |    8 ++++----
 sw/source/core/crsr/callnk.cxx     |    2 +-
 sw/source/core/crsr/callnk.hxx     |    2 +-
 sw/source/core/unocore/unoobj2.cxx |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 47c830d2ffc641aa0ae359a99ae38f17a1f1090e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 23 20:56:36 2018 +0100

    coverity#1435749 silence Uncaught exception
    
    and
    
    coverity#1399120 Uncaught exception
    
    Change-Id: If411cd6a392636c6ac99f1ae330b16611b24df93

diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 19f4077d0a2b..2d93c7b5a2cf 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -75,12 +75,12 @@ public:
 class UnoActionRemoveContext
 {
 private:
-        SwDoc *const m_pDoc;
+    SwDoc *const m_pDoc;
 
 public:
-        UnoActionRemoveContext(SwDoc *const pDoc);
-        UnoActionRemoveContext(SwUnoTableCursor const& rCursor);
-        ~UnoActionRemoveContext();
+    UnoActionRemoveContext(SwDoc *const pDoc);
+    UnoActionRemoveContext(SwUnoTableCursor const& rCursor);
+    ~UnoActionRemoveContext() COVERITY_NOEXCEPT_FALSE;
 };
 
 /// helper function for implementing SwClient::Modify
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 0fb524de83fe..503f8378a9c0 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -96,7 +96,7 @@ static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell const & rShe
     }
 }
 
-SwCallLink::~SwCallLink()
+SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE
 {
     if( nNdTyp == SwNodeType::NONE || !rShell.m_bCallChgLnk ) // see ctor
         return ;
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 0e80d738032b..4ef45857a496 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -37,7 +37,7 @@ public:
     bool bHasSelection;
 
     explicit SwCallLink( SwCursorShell & rSh );
-    ~SwCallLink();
+    ~SwCallLink() COVERITY_NOEXCEPT_FALSE;
 
     static long getLayoutFrame( const SwRootFrame*, SwTextNode const & rNd, sal_Int32 nCntPos, bool bCalcFrame );
 };
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 193b400cb0e2..80ef021dddfb 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -298,7 +298,7 @@ UnoActionRemoveContext::UnoActionRemoveContext(SwUnoTableCursor const& rCursor)
     }
 }
 
-UnoActionRemoveContext::~UnoActionRemoveContext()
+UnoActionRemoveContext::~UnoActionRemoveContext() COVERITY_NOEXCEPT_FALSE
 {
     if (m_pDoc)
     {


More information about the Libreoffice-commits mailing list