auto_ptr -> scoped_ptr

Change-Id: I05c461deca118f1a1b75d94b4d00ce797987e8d6

4 files changed, 9 insertions, 15 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index 81dd76005aeb..76825909c8d8 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -22,12 +22,10 @@
 #define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOX_HXX
 
 #include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
+#include <boost/scoped_ptr.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <svtools/accessibletableprovider.hxx>
 
-
-#include <memory>
-
 // ============================================================================
 
 namespace accessibility {
@@ -191,7 +189,7 @@ protected:
 
 private:
     // members ----------------------------------------------------------------
-    ::std::auto_ptr< AccessibleBrowseBoxImpl > m_pImpl;
+    boost::scoped_ptr< AccessibleBrowseBoxImpl > m_pImpl;
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 8996a64bea1b..dfbf0f5f32d4 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -22,11 +22,10 @@
 
 #include <accessibility/extended/AccessibleGridControlBase.hxx>
 #include <accessibility/extended/AccessibleGridControlTable.hxx>
+#include <boost/scoped_ptr.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <svtools/accessibletable.hxx>
 
-#include <memory>
-
 // ============================================================================
 
 namespace accessibility {
@@ -178,7 +177,7 @@ protected:
 
 private:
     // members ----------------------------------------------------------------
-    ::std::auto_ptr< AccessibleGridControl_Impl > m_pImpl;
+    boost::scoped_ptr< AccessibleGridControl_Impl > m_pImpl;
 };
 
 // ============================================================================
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 5ef21b3be40d..f527ba6ca8cf 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -51,8 +51,8 @@
 #include "svtools/svtools.hrc"
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
-#include <memory>
 #include <queue>
+#include <boost/scoped_ptr.hpp>
 #include <boost/unordered_map.hpp>
 
 class TextEngine;
@@ -661,7 +661,7 @@ private:
 
     // All the following members have valid values only after calling init:
 
-    ::std::auto_ptr< Paragraphs > m_xParagraphs;
+    boost::scoped_ptr< Paragraphs > m_xParagraphs;
 
     // m_nViewOffset is from the start of the document (0) to the start of the
     // current view, and m_nViewHeight is the height of the view:
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 002326fed912..d13525df8a2c 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1800,13 +1800,11 @@ void Document::init()
     if (m_xParagraphs.get() == 0)
     {
         ::sal_uLong nCount = m_rEngine.GetParagraphCount();
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr< Paragraphs > p(new Paragraphs);
-        SAL_WNODEPRECATED_DECLARATIONS_POP
-        p->reserve(static_cast< Paragraphs::size_type >(nCount));
+        m_xParagraphs.reset(new Paragraphs);
+        m_xParagraphs->reserve(static_cast< Paragraphs::size_type >(nCount));
             // numeric overflow is harmless here
         for (::sal_uLong i = 0; i < nCount; ++i)
-            p->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
+            m_xParagraphs->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
                                            m_rEngine.GetTextHeight(i))));
                 // XXX  numeric overflow
         m_nViewOffset = static_cast< ::sal_Int32 >(
@@ -1814,7 +1812,6 @@ void Document::init()
         m_nViewHeight = static_cast< ::sal_Int32 >(
             m_rView.GetWindow()->GetOutputSizePixel().Height());
             // XXX  numeric overflow
-        m_xParagraphs = p;
         determineVisibleRange();
         m_nSelectionFirstPara = -1;
         m_nSelectionFirstPos = -1;