diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-11-11 11:20:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-11 22:09:41 +0100 |
| commit | c39749b1472f2719c6de59debd40e793550b5f46 (patch) | |
| tree | f5d7cd33f92b0b47dce85646ec0bc420ab772b9b /sw/source/filter | |
| parent | 06ca3d89f4b9761f1bfea66a93f0fc7e0bab71a6 (diff) | |
remove an ugly coverity warning suppression
if the warning reappears o3tl::suppress_fun_call_w_exception is
my intended weapon of choice given the now commonplace use
of std::optional which doesn't have a deleter arg when the same
problem arises there
Change-Id: If843173a45f50a266fe7a79126bd2892f7686a48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125043
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 5 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par3.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 14a1ea1a35b7..b978b08f755b 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -52,7 +52,6 @@ #include <fmtsrnd.hxx> #include <ndtxt.hxx> #include <editeng/lrspitem.hxx> -#include <o3tl/deleter.hxx> #include <o3tl/sorted_vector.hxx> #include <oox/ole/olehelper.hxx> @@ -158,7 +157,7 @@ public: SwNumRule* GetNumRuleForActivation(sal_uInt16 nLFOPosition, const sal_uInt8 nLevel, std::vector<sal_uInt8> &rParaSprms, SwTextNode *pNode=nullptr); SwNumRule* CreateNextRule(bool bSimple); - ~WW8ListManager() COVERITY_NOEXCEPT_FALSE; + ~WW8ListManager(); SwNumRule* GetNumRule(size_t i); size_t GetWW8LSTInfoNum() const{return maLSTInfos.size();} static SvxNumType GetSvxNumTypeFromMSONFC(sal_uInt16 nMSONFC); @@ -1226,7 +1225,7 @@ private: std::shared_ptr<WW8Fib> m_xWwFib; std::unique_ptr<WW8Fonts> m_xFonts; std::unique_ptr<WW8Dop> m_xWDop; - std::unique_ptr<WW8ListManager, o3tl::default_delete<WW8ListManager>> m_xLstManager; + std::unique_ptr<WW8ListManager> m_xLstManager; std::unique_ptr<WW8ScannerBase> m_xSBase; std::shared_ptr<WW8PLCFMan> m_xPlcxMan; std::map<short, OUString> m_aLinkStringMap; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index ae076c584437..900d252c9049 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1480,7 +1480,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) rSt.Seek( nOriginalPos ); } -WW8ListManager::~WW8ListManager() COVERITY_NOEXCEPT_FALSE +WW8ListManager::~WW8ListManager() { /* named lists remain in document |