diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-18 13:49:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-29 09:58:26 +0200 |
commit | b69457c1a5cb31c8b0fb3d047e2826bc3d61fea4 (patch) | |
tree | 8b6c9b3a9b38dc59dbccc6ac58c1ee7ac6503d42 /dbaccess | |
parent | 07610feeeff47fc5bbe057c91c50ffae54a41c85 (diff) |
loplugin:useuniqueptr in OTableSubscriptionDialog
Change-Id: If8fa9edc62f75f41de1392688a169458ce003bda
Reviewed-on: https://gerrit.libreoffice.org/54852
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 10 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TablesSingleDlg.hxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 65f95fdf689f..2c18a418b69a 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -47,10 +47,10 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent { m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); - m_pOutSet = new SfxItemSet( *_pItems ); + m_pOutSet.reset(new SfxItemSet( *_pItems )); m_pImpl->translateProperties(xDatasource, *m_pOutSet); - SetInputSet(m_pOutSet); + SetInputSet(m_pOutSet.get()); VclPtrInstance<OTableSubscriptionPage> pTabPage(get_content_area(), *m_pOutSet, this); pTabPage->SetServiceFactory(_rxORB); @@ -64,7 +64,7 @@ OTableSubscriptionDialog::~OTableSubscriptionDialog() void OTableSubscriptionDialog::dispose() { - delete m_pOutSet; + m_pOutSet.reset(); SfxSingleTabDialog::dispose(); } @@ -110,12 +110,12 @@ Reference< XPropertySet > const & OTableSubscriptionDialog::getCurrentDataSource const SfxItemSet* OTableSubscriptionDialog::getOutputSet() const { - return m_pOutSet; + return m_pOutSet.get(); } SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet() { - return m_pOutSet; + return m_pOutSet.get(); } } // namespace dbaui diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 4622f91a72ca..2df28c524308 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -44,7 +44,7 @@ class ODbDataSourceAdministrationHelper; std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bStopExecution; // set when the dialog should not be executed - SfxItemSet* m_pOutSet; + std::unique_ptr<SfxItemSet> m_pOutSet; public: OTableSubscriptionDialog(vcl::Window* pParent |