summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-11-16 15:11:01 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-11-17 09:44:05 +0100
commitfcad2503ede92b515076f9bb3162855dcc2c575d (patch)
tree3b627b24a7b15c433ae6aa82e99fd8fff9e4cb64 /sw/source
parenta120bb3caa286edfcaf7a8d78d1250f131156ccf (diff)
replace an ugly coverity warning suppression
Change-Id: I320d84901368f0586a113fd2afe1cb6a5eb19b11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125320 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/uibase/app/applab.cxx2
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx7
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index c5fb25b624c2..4bb9ed9f49c1 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -140,7 +140,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS
// Create DB-Manager
- std::unique_ptr<SwDBManager, o3tl::default_delete<SwDBManager>> pDBManager(new SwDBManager(nullptr));
+ std::unique_ptr<SwDBManager> pDBManager(new SwDBManager(nullptr));
#endif
// Read SwLabItem from Config
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index db16de43e35e..15fa5386b06a 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -704,7 +704,7 @@ SwDBManager::SwDBManager(SwDoc* pDoc)
{
}
-SwDBManager::~SwDBManager() COVERITY_NOEXCEPT_FALSE
+void SwDBManager::ImplDestroy()
{
RevokeLastRegistrations();
@@ -732,6 +732,11 @@ SwDBManager::~SwDBManager() COVERITY_NOEXCEPT_FALSE
}
}
+SwDBManager::~SwDBManager()
+{
+ suppress_fun_call_w_exception(ImplDestroy());
+}
+
static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell )
{
//reset all links of the sections of synchronized labels