Those auto_ptr can be replaced with boost::scoped_ptr.

Change-Id: I2aa68c7bf265943e3d015a069fab461882c81554

2 files changed, 18 insertions, 21 deletions

diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index a5909ef41f59..000399109615 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/uno/Reference.h>
 
 #include <map>
-#include <memory>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 #include <xmloff/xmltkmap.hxx>
 #include <comphelper/stl_types.hxx>
@@ -371,7 +371,7 @@ class XMLOFF_DLLPUBLIC XMLTextImportHelper : public UniRefBase,
 {
 private:
     struct Impl;
-    ::std::auto_ptr<Impl> m_pImpl;
+    boost::scoped_ptr<Impl> m_pImpl;
     /// ugly, but implementation of this is in XMLPropertyBackpatcher.cxx
     struct BackpatcherImpl;
     ::boost::shared_ptr<BackpatcherImpl> m_pBackpatcherImpl;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b00b8a20dafb..00ece9dac7eb 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -489,22 +489,20 @@ static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
 struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
     : private ::boost::noncopyable
 {
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextElemTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextPElemTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextPAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextFieldAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextNumberedParagraphAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextListBlockAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextListBlockElemTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextFrameAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextContourAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextHyperlinkAttrTokenMap;
-    ::std::auto_ptr<SvXMLTokenMap> m_pTextMasterPageElemTokenMap;
-    ::std::auto_ptr< std::vector<OUString> > m_pPrevFrmNames;
-    ::std::auto_ptr< std::vector<OUString> > m_pNextFrmNames;
-    ::std::auto_ptr<XMLTextListsHelper> m_pTextListsHelper;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextElemTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextPElemTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextPAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextFieldAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextNumberedParagraphAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextListBlockAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextListBlockElemTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextFrameAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextContourAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextHyperlinkAttrTokenMap;
+    boost::scoped_ptr<SvXMLTokenMap> m_pTextMasterPageElemTokenMap;
+    boost::scoped_ptr< std::vector<OUString> > m_pPrevFrmNames;
+    boost::scoped_ptr< std::vector<OUString> > m_pNextFrmNames;
+    boost::scoped_ptr<XMLTextListsHelper> m_pTextListsHelper;
 
     SvXMLImportContextRef m_xAutoStyles;
     SvXMLImportContextRef m_xFontDecls;
@@ -515,9 +513,8 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
     UniReference< SvXMLImportPropertyMapper > m_xSectionImpPrMap;
     UniReference< SvXMLImportPropertyMapper > m_xRubyImpPrMap;
 
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<SvI18NMap> m_pRenameMap;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    boost::scoped_ptr<SvI18NMap> m_pRenameMap;
+
     /* Change and extend data structure:
        - data structure contains candidates of paragraph styles, which
          will be assigned to the outline style