diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-25 16:30:23 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-25 16:33:15 +0900 |
| commit | 4a9347fa320d892b60fd03082925f63a1d69cfb9 (patch) | |
| tree | d4cd8ab03b5cd5b70e5637acbc471c7953a8165a /svtools | |
| parent | 9aee4d1c9e5a0289f0d3d7b4a13046eab60e316e (diff) | |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I8e11ffe888aac8887c4c0875c41de51f343debae
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/fileview.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 9e525f3ad1e5..b0e0544d50a1 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -52,7 +52,6 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <algorithm> -#include <memory> #include <vector> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> @@ -72,6 +71,7 @@ #include <unotools/syslocale.hxx> #include <svl/urlfilter.hxx> #include <boost/ptr_container/ptr_set.hpp> +#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; @@ -1790,7 +1790,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl( m_aCurrentAsyncActionHandler = Link(); // minimum time to wait - ::std::auto_ptr< TimeValue > pTimeout( new TimeValue ); + boost::scoped_ptr< TimeValue > pTimeout( new TimeValue ); sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout; OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" ); if ( nMinTimeout <= 0 ) diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 42664629d06f..dc7b3c63227f 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -36,7 +36,7 @@ #include <svtools/svmedit.hxx> #include <algorithm> -#include <memory> +#include <boost/scoped_ptr.hpp> #define IMPICNVIEW_ACC_RETURN 1 #define IMPICNVIEW_ACC_ESCAPE 2 @@ -320,7 +320,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator ) { - ::std::auto_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator; + boost::scoped_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator; if ( !_pGenerator ) { _pGenerator = new MnemonicGenerator; diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 966cea87b75f..c1f4324dc668 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -26,7 +26,7 @@ #include <rtl/strbuf.hxx> #include "grfcache.hxx" #include <rtl/crc.h> -#include <memory> +#include <boost/scoped_ptr.hpp> #define RELEASE_TIMEOUT 10000 #define MAX_BMP_EXTENT 4096 @@ -884,7 +884,7 @@ void GraphicCache::AddGraphicObject( if( !bInserted ) { GraphicCacheEntryList::iterator it = maGraphicCache.begin(); - ::std::auto_ptr< GraphicID > apID; + boost::scoped_ptr< GraphicID > apID; if( !pID ) { |