diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-03 16:25:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-06 08:49:38 +0200 |
| commit | 8d9aea221f4233e861343b48dab5d5d629b2f4d6 (patch) | |
| tree | 4e89e4b0b2cd9b477b34f9051110f687d7decb47 /sw | |
| parent | 078493d96bd19234d673099a9824375834990a97 (diff) | |
loplugin:useuniqueptr in WW8PLCFx_Book
Change-Id: I7e8848da73d40d1c1e57c6eee3f2339cc10a5309
Reviewed-on: https://gerrit.libreoffice.org/58574
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -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 6c098ec88e59..98365bee136e 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4273,14 +4273,13 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const WW8Fib& rFib) if( !rFib.m_fcPlcfbkf || !rFib.m_lcbPlcfbkf || !rFib.m_fcPlcfbkl || !rFib.m_lcbPlcfbkl || !rFib.m_fcSttbfbkmk || !rFib.m_lcbSttbfbkmk ) { - pBook[0] = pBook[1] = nullptr; nIMax = 0; } else { - pBook[0] = new WW8PLCFspecial(pTableSt,rFib.m_fcPlcfbkf,rFib.m_lcbPlcfbkf,4); + pBook[0].reset( new WW8PLCFspecial(pTableSt,rFib.m_fcPlcfbkf,rFib.m_lcbPlcfbkf,4) ); - pBook[1] = new WW8PLCFspecial(pTableSt,rFib.m_fcPlcfbkl,rFib.m_lcbPlcfbkl,0); + pBook[1].reset( new WW8PLCFspecial(pTableSt,rFib.m_fcPlcfbkl,rFib.m_lcbPlcfbkl,0) ); rtl_TextEncoding eStructChrSet = WW8Fib::GetFIBCharset(rFib.m_chseTables, rFib.m_lid); @@ -4299,8 +4298,6 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTableSt, const WW8Fib& rFib) WW8PLCFx_Book::~WW8PLCFx_Book() { - delete pBook[1]; - delete pBook[0]; } sal_uInt32 WW8PLCFx_Book::GetIdx() const diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index ba0d110c944c..dddc26a508a4 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -750,7 +750,7 @@ enum eBookStatus { BOOK_NORMAL = 0, BOOK_IGNORE = 0x1, BOOK_FIELD = 0x2 }; class WW8PLCFx_Book : public WW8PLCFx { private: - WW8PLCFspecial* pBook[2]; // Start and End Position + std::unique_ptr<WW8PLCFspecial> pBook[2]; // Start and End Position std::vector<OUString> aBookNames; // Name std::vector<eBookStatus> aStatus; long nIMax; // Number of Booknotes |