diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:41:03 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-02 16:49:49 +0200 |
commit | 075d472a9d120431f0b8731e4dcfe3e8b4ded521 (patch) | |
tree | 90f565b0f3c4afdf3294d857969ef724e091a139 /dbaccess | |
parent | 3e1bd6961d3317fe2bef4a34a41f5d1fc2a33008 (diff) |
Use std::auto_ptr::reset where applicable
(avoids warnings about std::auto_ptr ctor being deprecated)
Change-Id: I39d2d155c0bc62ca77a30c02428ea39102213f42
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/advancedsettings.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dbadmin.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dbwiz.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dbwizsetup.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 95a3b65b12bc..c5868d6de365 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -60,7 +60,7 @@ DBG_NAME(OUserAdminDlg) { DBG_CTOR(OUserAdminDlg,NULL); - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this)); + m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); m_pImpl->translateProperties(xDatasource, *_pItems); diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 50a86b4293e0..84088c7c3ce3 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -431,7 +431,7 @@ namespace dbaui const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName ) :SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems) { - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this)); + m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); m_pImpl->translateProperties(xDatasource, *_pItems); diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 285feff712e7..609cc9ae81ac 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -60,7 +60,7 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent { DBG_CTOR(ODbAdminDialog,NULL); - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxContext,this,this)); + m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,this,this)); // add the initial tab page AddTabPage( m_nMainPageID, OUString( ModuleRes( STR_PAGETITLE_GENERAL ) ), OConnectionTabPage::Create, NULL ); diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 17a495c1e332..ae57cc294190 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -76,7 +76,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent ,m_bUIEnabled( sal_True ) { DBG_CTOR(ODbTypeWizDialog,NULL); - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); + m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index f5579f6e72f9..db3c14e7221c 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -150,7 +150,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent FreeResource(); - m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); + m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); m_pImpl->setDataSourceOrName(_aDataSourceName); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); |