summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-11-22 09:10:23 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-11-22 20:31:08 +0100
commitdcc890e3b00ec174f4c752199ec54a8d873aaf8e (patch)
tree1825e6127c1326098dd15398e9bf0df323b543a5
parent5a00326951690d820d8ea5412a93aadf3da42dc1 (diff)
remove an ugly coverity warning suppression
Change-Id: Id67530f1a7c91e3e4e29974b7b9050c7b1fc159f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125669 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/inc/UndoCore.hxx4
-rw-r--r--sw/source/core/undo/undobj.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index af5a6b7f04da..7e670c9c6ba4 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -67,7 +67,7 @@ public:
class SwRedlineSaveDatas {
private:
- std::vector<std::unique_ptr<SwRedlineSaveData, o3tl::default_delete<SwRedlineSaveData>>> m_Data;
+ std::vector<std::unique_ptr<SwRedlineSaveData>> m_Data;
public:
SwRedlineSaveDatas() : m_Data() {}
@@ -75,7 +75,7 @@ public:
void clear() { m_Data.clear(); }
bool empty() const { return m_Data.empty(); }
size_t size() const { return m_Data.size(); }
- void push_back(std::unique_ptr<SwRedlineSaveData, o3tl::default_delete<SwRedlineSaveData>> pNew) { m_Data.push_back(std::move(pNew)); }
+ void push_back(std::unique_ptr<SwRedlineSaveData> pNew) { m_Data.push_back(std::move(pNew)); }
const SwRedlineSaveData& operator[](size_t const nIdx) const { return *m_Data[ nIdx ]; }
SwRedlineSaveData& operator[](size_t const nIdx) { return *m_Data[ nIdx ]; }
};
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 2641e179d952..b03a3e1daded 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1430,7 +1430,7 @@ bool SwUndo::FillSaveData(
&& eCmpPos != SwComparePosition::CollideStart )
{
- rSData.push_back(std::unique_ptr<SwRedlineSaveData, o3tl::default_delete<SwRedlineSaveData>>(new SwRedlineSaveData(eCmpPos, *pStt, *pEnd, *pRedl, bCopyNext)));
+ rSData.push_back(std::unique_ptr<SwRedlineSaveData>(new SwRedlineSaveData(eCmpPos, *pStt, *pEnd, *pRedl, bCopyNext)));
}
}
if( !rSData.empty() && bDelRange )
@@ -1461,7 +1461,7 @@ bool SwUndo::FillSaveDataForFormat(
&& eCmpPos != SwComparePosition::CollideEnd
&& eCmpPos != SwComparePosition::CollideStart )
{
- rSData.push_back(std::unique_ptr<SwRedlineSaveData, o3tl::default_delete<SwRedlineSaveData>>(new SwRedlineSaveData(eCmpPos, *pStt, *pEnd, *pRedl, true)));
+ rSData.push_back(std::unique_ptr<SwRedlineSaveData>(new SwRedlineSaveData(eCmpPos, *pStt, *pEnd, *pRedl, true)));
}
}