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 /sw/source/ui/dbui | |
| 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 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index ce767bace9e7..95bac6ed83bb 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1154,7 +1154,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, break; if( 10 == i ) - pWait = ::std::auto_ptr<SwWait>(new SwWait( *pView->GetDocShell(), sal_True )); + pWait.reset(new SwWait( *pView->GetDocShell(), sal_True )); } rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() ); @@ -1382,7 +1382,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, rSh.SwEditShell::SplitNode(); if( 10 == i ) - pWait = ::std::auto_ptr<SwWait>(new SwWait( *pView->GetDocShell(), sal_True )); + pWait.reset(new SwWait( *pView->GetDocShell(), sal_True )); } if( !bSetCrsr && pMark != NULL) diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index c67ef7b131ed..44ac4fe5c6ae 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1001,7 +1001,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, aEntry.removeSegment(); sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE ); OUString sExt(comphelper::string::stripStart(pStoreToFilter->GetDefaultExtension(), '*')); - aTempFile = std::auto_ptr< utl::TempFile >( + aTempFile.reset( new utl::TempFile(sLeading,&sExt,&sPath )); if( bAsSingleFile ) aTempFile->EnableKillingFile(); |