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

[Caolán McNamara]

 sw/inc/dbmgr.hxx                |    2 +-
 sw/inc/doc.hxx                  |    4 ++--
 sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 86e9d28c58ee7fa9a7f803ff443f86d55961d451
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 26 12:12:39 2018 +0000

    coverity#1401307 Uncaught exception
    
    and
    
    coverity#1401308 Uncaught exception
    
    Change-Id: Ia8ab29a45888cf9b1014e4e4ac32c5de930a2935
    Reviewed-on: https://gerrit.libreoffice.org/48688
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 555d4dc9079f..77fa9437150c 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -291,7 +291,7 @@ class SW_DLLPUBLIC SwDBManager
 
 public:
     SwDBManager(SwDoc* pDoc);
-    ~SwDBManager() COVERITY_NOEXCEPT_FALSE;
+    ~SwDBManager();
 
     /// MailMergeEvent source
     const SwXMailMerge *    GetMailMergeEvtSrc() const  { return pMergeEvtSrc; }
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index aa7ee77406cf..49cc1bd41551 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -21,6 +21,7 @@
 
 // SwDoc interfaces
 #include <com/sun/star/embed/XStorage.hpp>
+#include <o3tl/deleter.hxx>
 #include <vcl/idle.hxx>
 #include "swdllapi.h"
 #include "swtypes.hxx"
@@ -41,7 +42,6 @@
 #include "docary.hxx"
 #include "pagedesc.hxx"
 #include "tblenum.hxx"
-
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ -283,7 +283,7 @@ class SW_DLLPUBLIC SwDoc final
     SwTOXTypes      *mpTOXTypes;                   //< Tables/indices
     SwDefTOXBase_Impl * mpDefTOXBases;             //< defaults of SwTOXBase's
 
-    std::unique_ptr<SwDBManager> m_pOwnDBManager; //< own DBManager
+    std::unique_ptr<SwDBManager, o3tl::default_delete<SwDBManager>> m_pOwnDBManager; //< own DBManager
     SwDBManager * m_pDBManager; //< DBManager for evaluation of DB-fields.
 
     SwNumRule       *mpOutlineRule;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 5d9ccaf0fa13..a9308ee063bc 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -801,7 +801,7 @@ SwDBManager::SwDBManager(SwDoc* pDoc)
 {
 }
 
-SwDBManager::~SwDBManager() COVERITY_NOEXCEPT_FALSE
+SwDBManager::~SwDBManager()
 {
     RevokeLastRegistrations();