just silence the auto_ptr deprecations in isolation

5 files changed, 18 insertions, 1 deletions

diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index f920425e0d8e..6311db18c623 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -127,13 +127,19 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
     XMLPropertyState* pFooterDynamic = NULL;
     XMLPropertyState* pAllMarginProperty = NULL;
     XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     XMLPropertyState* pAllHeaderMarginProperty = NULL;
     XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL };
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<XMLPropertyState> pNewHeaderMargins[4];
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     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::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 292a77f42465..0e420340d83a 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -207,6 +207,7 @@ template class XMLPropertyBackpatcher<OUString>;
 
 struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     /// backpatcher for references to footnotes and endnotes
     ::std::auto_ptr< XMLPropertyBackpatcher<sal_Int16> >
         m_pFootnoteBackpatcher;
@@ -217,7 +218,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::BackpatcherImpl
 
     ::std::auto_ptr< XMLPropertyBackpatcher< ::rtl::OUString> >
         m_pSequenceNameBackpatcher;
-
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 };
 
 ::boost::shared_ptr<XMLTextImportHelper::BackpatcherImpl>
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 4468c059e3f0..9a12573389f3 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -525,6 +525,7 @@ 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;
@@ -539,6 +540,7 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
     ::std::auto_ptr<SvStringsDtor> m_pPrevFrmNames;
     ::std::auto_ptr<SvStringsDtor> m_pNextFrmNames;
     ::std::auto_ptr<XMLTextListsHelper> m_pTextListsHelper;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     SvXMLImportContextRef m_xAutoStyles;
     SvXMLImportContextRef m_xFontDecls;
@@ -549,7 +551,9 @@ 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
     /* Change and extend data structure:
        - data structure contains candidates of paragraph styles, which
          will be assigned to the outline style
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 64598e687615..0e22f4b88023 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -318,10 +318,14 @@ 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
     XMLPropertyState* pAllMargin = 0;
     XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 };
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<XMLPropertyState> pNewMargins[4];
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
     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 4e00ce513185..ad6eaeee6315 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -263,10 +263,12 @@ 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
     };
 }