From e26f8d2592a3d7cc5b43b3246b364397dd704f0d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 25 Aug 2017 11:09:38 +0100
Subject: coverity#1401307 document checked 'Uncaught exception'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

markup std::unique_ptr where coverity warns a dtor might throw exceptions which
won't throw in practice, or where std::terminate is an acceptable response if
they do

Change-Id: Icc99cdecf8d8b011e599574f0a05b59efd1c65c2
Reviewed-on: https://gerrit.libreoffice.org/41561
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 sw/inc/list.hxx                      | 3 ++-
 sw/source/uibase/app/applab.cxx      | 3 ++-
 sw/source/uibase/dochdl/swdtflvr.cxx | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'sw')

diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index d3ef07c8ea4c..a5698c3cb1e5 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_INC_LIST_HXX
 #define INCLUDED_SW_INC_LIST_HXX
 
+#include <o3tl/deleter.hxx>
 #include <rtl/ustring.hxx>
 #include <memory>
 
@@ -58,7 +59,7 @@ class SwList
         SwList( const SwList& ) = delete;
         SwList& operator=( const SwList& ) = delete;
 
-        std::unique_ptr<SwListImpl> mpListImpl;
+        std::unique_ptr<SwListImpl, o3tl::default_delete<SwListImpl>> mpListImpl;
 };
 #endif // INCLUDED_SW_INC_LIST_HXX
 
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 030d8ffda666..4a0bd4568151 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -24,6 +24,7 @@
 #include <hintids.hxx>
 
 #include <comphelper/string.hxx>
+#include <o3tl/deleter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/msgbox.hxx>
@@ -156,7 +157,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
 
 #if HAVE_FEATURE_DBCONNECTIVITY
     // Create DB-Manager
-    std::unique_ptr<SwDBManager> pDBManager(new SwDBManager(nullptr));
+    std::unique_ptr<SwDBManager, o3tl::default_delete<SwDBManager>> pDBManager(new SwDBManager(nullptr));
 #endif
 
     // Read SwLabItem from Config
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 3f0ebad4116a..1f206ea72bd4 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
+#include <o3tl/deleter.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <sot/filelist.hxx>
 #include <svx/svxdlg.hxx>
@@ -1187,7 +1188,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                             bool bPasteSelection, RndStdIds nAnchorType )
 {
     SwWait aWait( *rSh.GetView().GetDocShell(), false );
-    std::unique_ptr<SwTrnsfrActionAndUndo> pAction;
+    std::unique_ptr<SwTrnsfrActionAndUndo, o3tl::default_delete<SwTrnsfrActionAndUndo>> pAction;
     SwModule* pMod = SW_MOD();
 
     bool bRet = false;
-- 
cgit