diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-03 16:16:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-06 08:49:34 +0200 |
| commit | 078493d96bd19234d673099a9824375834990a97 (patch) | |
| tree | 7a0fbc33c3000528282f5e63dec56481df0e937e | |
| parent | 96b36edb8963706560a55a5e93a471e39ebd846f (diff) | |
loplugin:useuniqueptr in WW8PLCFx_AtnBook
Change-Id: I2bff645db03d0962764df33c7a2af1dbbc44b954
Reviewed-on: https://gerrit.libreoffice.org/58573
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 7 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0a022fba94d2..6c098ec88e59 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4536,13 +4536,12 @@ WW8PLCFx_AtnBook::WW8PLCFx_AtnBook(SvStream* pTableSt, const WW8Fib& rFib) { if (!rFib.m_fcPlcfAtnbkf || !rFib.m_lcbPlcfAtnbkf || !rFib.m_fcPlcfAtnbkl || !rFib.m_lcbPlcfAtnbkl) { - m_pBook[0] = m_pBook[1] = nullptr; nIMax = 0; } else { - m_pBook[0] = new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfAtnbkf, rFib.m_lcbPlcfAtnbkf, 4); - m_pBook[1] = new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfAtnbkl, rFib.m_lcbPlcfAtnbkl, 0); + m_pBook[0].reset( new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfAtnbkf, rFib.m_lcbPlcfAtnbkf, 4) ); + m_pBook[1].reset( new WW8PLCFspecial(pTableSt, rFib.m_fcPlcfAtnbkl, rFib.m_lcbPlcfAtnbkl, 0) ); nIMax = m_pBook[0]->GetIMax(); if (m_pBook[1]->GetIMax() < nIMax) @@ -4552,8 +4551,6 @@ WW8PLCFx_AtnBook::WW8PLCFx_AtnBook(SvStream* pTableSt, const WW8Fib& rFib) WW8PLCFx_AtnBook::~WW8PLCFx_AtnBook() { - delete m_pBook[1]; - delete m_pBook[0]; } sal_uInt32 WW8PLCFx_AtnBook::GetIdx() const diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 779828794cc8..ba0d110c944c 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -790,7 +790,7 @@ class WW8PLCFx_AtnBook : public WW8PLCFx { private: /// Start and end positions. - WW8PLCFspecial* m_pBook[2]; + std::unique_ptr<WW8PLCFspecial> m_pBook[2]; /// Number of annotation marks sal_Int32 nIMax; bool m_bIsEnd; |