xmloff: std::auto_ptr -> std::unique_ptr

Change-Id: I8baa6c0573af3629bacbf1891c3196c165883d9e

9 files changed, 19 insertions, 33 deletions

diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index da3919ea1234..24296f36e4da 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -32,7 +32,7 @@ struct XMLDocumentSettingsContext_Data;
 
 class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
 {
-    ::std::auto_ptr< XMLDocumentSettingsContext_Data >  m_pData;
+    ::std::unique_ptr< XMLDocumentSettingsContext_Data >  m_pData;
 
 public:
     XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 2323660455f6..37ec27b42508 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -76,7 +76,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
     rtl::Reference < SvXMLExportPropertyMapper > xSectionPropMapper;
     rtl::Reference < SvXMLExportPropertyMapper > xRubyPropMapper;
 
-    const ::std::auto_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets;
+    const ::std::unique_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets;
     XMLTextFieldExport          *pFieldExport;
     std::vector<OUString>  *pListElements;
     XMLTextListAutoStylePool    *pListAutoPool;
@@ -675,7 +675,7 @@ public:
     void PopTextListsHelper();
 
 private:
-        XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of auto_ptr
+        XMLTextParagraphExport(XMLTextParagraphExport &); // private copy-ctor because of explicit copy-ctor of unique_ptr
 };
 
 inline const XMLTextListAutoStylePool&
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 25ef7fcfaa99..f41e0d379998 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -84,7 +84,7 @@ class XMLOFF_DLLPUBLIC SvXMLUnitConverter
 {
 private:
     struct Impl;
-    ::std::auto_ptr<Impl> m_pImpl;
+    ::std::unique_ptr<Impl> m_pImpl;
 
 public:
     /** constructs a SvXMLUnitConverter. The core measure unit is the
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index d704318f9ea6..8b35d5d5da0c 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -271,7 +271,7 @@ public:
     /// counts depth (number of open elements/start tags)
     long mDepth;
 
-    ::std::auto_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
+    ::std::unique_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
 
     bool                                                mbExportTextNumberElement;
     bool                                                mbNullDateInitialized;
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 804e540bcc5a..f9f196929324 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -295,9 +295,9 @@ public:
 
     uno::Reference< embed::XStorage > mxSourceStorage;
 
-    std::auto_ptr< xmloff::RDFaImportHelper > mpRDFaHelper;
+    std::unique_ptr< xmloff::RDFaImportHelper > mpRDFaHelper;
 
-    std::auto_ptr< DocumentInfo > mpDocumentInfo;
+    std::unique_ptr< DocumentInfo > mpDocumentInfo;
 
     SvXMLImport_Impl( const uno::Reference< uno::XComponentContext >& rxContext,
                       OUString const & theImplementationName)
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 46a52639e938..7073ab64153b 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -117,19 +117,13 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
     boost::scoped_ptr<XMLPropertyState> xFooterDynamic;
     XMLPropertyState* pAllMarginProperty = NULL;
     XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<XMLPropertyState> pNewMargins[4];
     XMLPropertyState* pAllHeaderMarginProperty = NULL;
     XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<XMLPropertyState> pNewHeaderMargins[4];
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4];
     XMLPropertyState* pAllFooterMarginProperty = NULL;
     XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL };
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<XMLPropertyState> pNewFooterMargins[4];
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<XMLPropertyState> pNewFooterMargins[4];
 
     ::std::vector< XMLPropertyState >::iterator aEnd = rProperties.end();
     for (::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); aIter != aEnd; ++aIter)
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 981524ee28ea..86d6297d8418 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -152,18 +152,16 @@ template class XMLPropertyBackpatcher<OUString>;
 
 struct XMLTextImportHelper::BackpatcherImpl
 {
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     /// backpatcher for references to footnotes and endnotes
-    ::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> >
+    ::std::unique_ptr< XMLPropertyBackpatcher<sal_Int16> >
         m_pFootnoteBackpatcher;
 
     /// backpatchers for references to sequences
-    ::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> >
+    ::std::unique_ptr< XMLPropertyBackpatcher<sal_Int16> >
         m_pSequenceIdBackpatcher;
 
-    ::std::auto_ptr< XMLPropertyBackpatcher< OUString> >
+    ::std::unique_ptr< XMLPropertyBackpatcher< OUString> >
         m_pSequenceNameBackpatcher;
-    SAL_WNODEPRECATED_DECLARATIONS_POP
 };
 
 ::boost::shared_ptr<XMLTextImportHelper::BackpatcherImpl>
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index b2007635a614..395759a3b17c 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -394,14 +394,10 @@ void XMLTextImportPropertyMapper::finished(
     XMLPropertyState* pBackTransparent = NULL;  // transparency as boolean
     XMLPropertyState* pAllParaMargin = 0;
     XMLPropertyState* pParaMargins[4] = { 0, 0, 0, 0 };
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<XMLPropertyState> pNewParaMargins[4];
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<XMLPropertyState> pNewParaMargins[4];
     XMLPropertyState* pAllMargin = 0;
     XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    ::std::unique_ptr<XMLPropertyState> pNewMargins[4];
 
     for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin();
          aIter != rProperties.end();
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 949acaca789a..5b932114dd23 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -240,12 +240,10 @@ namespace xmloff
             const BoundFrames* GetShapes() const
                 { return m_pShapes.get(); };
         private:
-            SAL_WNODEPRECATED_DECLARATIONS_PUSH
-            auto_ptr<BoundFrames> m_pTexts;
-            auto_ptr<BoundFrames> m_pGraphics;
-            auto_ptr<BoundFrames> m_pEmbeddeds;
-            auto_ptr<BoundFrames> m_pShapes;
-            SAL_WNODEPRECATED_DECLARATIONS_POP
+            unique_ptr<BoundFrames> m_pTexts;
+            unique_ptr<BoundFrames> m_pGraphics;
+            unique_ptr<BoundFrames> m_pEmbeddeds;
+            unique_ptr<BoundFrames> m_pShapes;
     };
 }