diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-19 15:44:12 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2018-01-21 15:06:47 +0100 |
| commit | 5776d219db28b795acb952e9728cc9502403bcb8 (patch) | |
| tree | a3d26cede5460679d5481a136c56167fb2817351 /sw | |
| parent | 3ac287a705fdf801fd1f191fcbc2d74fc9ff2ffe (diff) | |
more ScopedVclPtr for dialogs
Change-Id: I0f19a0c1e312843bee0ee5c9939831918ddc2da7
Reviewed-on: https://gerrit.libreoffice.org/48198
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/addresslistdialog.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 77890e3b27fc..ef79ead501c6 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -357,8 +357,8 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl, Button*, void) IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) { OUString sInputURL; - VclPtr<SwCreateAddressListDialog> pDlg( - VclPtr<SwCreateAddressListDialog>::Create( + ScopedVclPtr<SwCreateAddressListDialog> pDlg( + VclPtr<SwCreateAddressListDialog>::Create( pButton, sInputURL, m_pAddressPage->GetWizard()->GetConfigItem())); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 68b6adde88f7..945e72c93382 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -218,8 +218,9 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, Button*, pButton, void) SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress(); const uno::Sequence< OUString> aBlocks = rConfigItem.GetAddressBlocks(); - VclPtr<SwAssignFieldsDialog> pDlg( - VclPtr<SwAssignFieldsDialog>::Create(pButton, m_pWizard->GetConfigItem(), aBlocks[nSel], true)); + ScopedVclPtr<SwAssignFieldsDialog> pDlg( + VclPtr<SwAssignFieldsDialog>::Create( + pButton, m_pWizard->GetConfigItem(), aBlocks[nSel], true)); if(RET_OK == pDlg->Execute()) { //preview update @@ -447,8 +448,9 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButton, vo SwCustomizeAddressBlockDialog::DialogType nType = bCustomize ? SwCustomizeAddressBlockDialog::ADDRESSBLOCK_EDIT : SwCustomizeAddressBlockDialog::ADDRESSBLOCK_NEW; - VclPtr<SwCustomizeAddressBlockDialog> pDlg( - VclPtr<SwCustomizeAddressBlockDialog>::Create(pButton,m_rConfig,nType)); + ScopedVclPtr<SwCustomizeAddressBlockDialog> pDlg( + VclPtr<SwCustomizeAddressBlockDialog>::Create( + pButton,m_rConfig,nType)); if(bCustomize) { pDlg->SetAddress(m_aAddressBlocks[m_pPreview->GetSelectedAddress()]); |