diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-26 15:15:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 08:19:33 +0200 |
| commit | 7fc64583c82f1ca545140fbde903a5cb19a97a06 (patch) | |
| tree | a0eb4aef9d0e17fd9d213a099914260ed41908a3 /sw/source/ui/envelp | |
| parent | 2d8634d236a1bc528ae5a3838556ff1b51e9deb7 (diff) | |
loplugin:useuniqueptr in SwEnvDlg
Change-Id: Ie907974dcdeb6f7f30801fc502d919afdab734f3
Reviewed-on: https://gerrit.libreoffice.org/58230
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/envelp/envlop1.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 98834e3d443c..f44b0c00f108 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -321,7 +321,7 @@ void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender) // A temporary Itemset that gets discarded at abort SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool bSender) { - SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet; + std::unique_ptr<SfxItemSet>& pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet; if (!pAddrSet) { // determine range (merge both Itemsets' ranges) @@ -346,12 +346,12 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool aVec2.insert(aVec2.end(), aVec.begin(), aVec.end()); std::unique_ptr<sal_uInt16[]> pNewRanges(::lcl_convertListToRanges(aVec2)); - pAddrSet = new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(), - pNewRanges.get()); + pAddrSet.reset(new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(), + pNewRanges.get())); pAddrSet->Put(pColl->GetAttrSet()); } - return pAddrSet; + return pAddrSet.get(); } IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, weld::ComboBoxText&, void) @@ -484,8 +484,8 @@ void SwEnvFormatPage::Reset(const SfxItemSet* rSet) setfieldval(*m_xSizeHeightField , std::min(rItem.m_nWidth, rItem.m_nHeight)); SetMinMax(); - DELETEZ(GetParentSwEnvDlg()->pSenderSet); - DELETEZ(GetParentSwEnvDlg()->pAddresseeSet); + GetParentSwEnvDlg()->pSenderSet.reset(); + GetParentSwEnvDlg()->pAddresseeSet.reset(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 756a61a6465d..730351caeca3 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -141,8 +141,8 @@ SwEnvDlg::SwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwEnvDlg::~SwEnvDlg() { - delete pAddresseeSet; - delete pSenderSet; + pAddresseeSet.reset(); + pSenderSet.reset(); } void SwEnvDlg::PageCreated(const OString& rId, SfxTabPage &rPage) |