auto_ptr -> scoped_ptr

Change-Id: I19fbc4f6e0fb0d53a72759e5faf9c86c595e8e17

4 files changed, 10 insertions, 9 deletions

diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 38317e09a4ab..59f28873abbb 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -31,6 +31,7 @@
 
 #include <basic/basmgr.hxx>
 #include <basic/sbmeth.hxx>
+#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
@@ -560,7 +561,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
         break;
         case SID_BASICIDE_SHOWWINDOW:
         {
-            ::std::auto_ptr< ScriptDocument > pDocument;
+            boost::scoped_ptr< ScriptDocument > pDocument;
 
             SFX_REQUEST_ARG( rReq, pDocumentItem, SfxStringItem, SID_BASICIDE_ARG_DOCUMENT, false );
             if ( pDocumentItem )
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index be60543041db..721ab895fd53 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -34,6 +34,7 @@
 
 #include <basic/sbmeth.hxx>
 #include <basic/sbx.hxx>
+#include <boost/scoped_ptr.hpp>
 #include <framework/documentundoguard.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/moduleoptions.hxx>
@@ -41,7 +42,6 @@
 
 #include <vector>
 #include <algorithm>
-#include <memory>
 #include <basic/basmgr.hxx>
 namespace basctl
 {
@@ -241,13 +241,13 @@ namespace
         (void)pThis;
         ENSURE_OR_RETURN( i_pData, "wrong MacroExecutionData", 0L );
         // take ownership of the data
-        ::std::auto_ptr< MacroExecutionData > pData( i_pData );
+        boost::scoped_ptr< MacroExecutionData > pData( i_pData );
 
         SAL_WARN_IF( !(pData->xMethod->GetParent()->GetFlags() & SBX_EXTSEARCH), "basctl.basicide","No EXTSEARCH!" );
 
         // in case this is a document-local macro, try to protect the document's Undo Manager from
         // flawed scripts
-        ::std::auto_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
+        boost::scoped_ptr< ::framework::DocumentUndoGuard > pUndoGuard;
         if ( pData->aDocument.isDocument() )
             pUndoGuard.reset( new ::framework::DocumentUndoGuard( pData->aDocument.getDocument() ) );
 
@@ -271,7 +271,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
     bool bError = false;
     SbMethod* pMethod = NULL;
 
-    ::std::auto_ptr< MacroChooser > pChooser( new MacroChooser( NULL, true ) );
+    boost::scoped_ptr< MacroChooser > pChooser( new MacroChooser( NULL, true ) );
     if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() )
         pChooser->SetMode(MacroChooser::ChooseOnly);
 
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index cd4af37a4d87..f9e322d1c315 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -20,11 +20,11 @@
 #ifndef BASCTL_DOCUMENTENUMERATION_HXX
 #define BASCTL_DOCUMENTENUMERATION_HXX
 
+#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <memory>
 #include <vector>
 
 namespace com { namespace sun { namespace star { namespace uno {
@@ -92,7 +92,7 @@ namespace basctl { namespace docs {
         ) const;
 
     private:
-        ::std::auto_ptr< DocumentEnumeration_Data > m_pData;
+        boost::scoped_ptr< DocumentEnumeration_Data > m_pData;
     };
 
 //........................................................................
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 30167194f914..8789734133ff 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -25,6 +25,7 @@
 #include "doceventnotifier.hxx"
 #include "documentenumeration.hxx"
 
+#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
@@ -201,8 +202,7 @@ namespace basctl
         Reference< XModel >             m_xDocument;
         Reference< XModifiable >        m_xDocModify;
         Reference< XEmbeddedScripts >   m_xScriptAccess;
-        ::std::auto_ptr< DocumentEventNotifier >
-                                        m_pDocListener;
+        boost::scoped_ptr< DocumentEventNotifier > m_pDocListener;
 
     public:
         Impl ();