From 4a9347fa320d892b60fd03082925f63a1d69cfb9 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Tue, 25 Feb 2014 16:30:23 +0900
Subject: Replace deprecated std::auto_ptr with boost::scoped_ptr

Change-Id: I8e11ffe888aac8887c4c0875c41de51f343debae
---
 svtools/source/contnr/fileview.cxx | 4 ++--
 svtools/source/contnr/imivctl1.cxx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'svtools/source/contnr')

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;
-- 
cgit