From 68daa8a22611605299ac3174a3632191f93236d9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Sep 2014 08:13:36 +0200 Subject: xmloff: std::auto_ptr -> std::unique_ptr Change-Id: I8baa6c0573af3629bacbf1891c3196c165883d9e --- xmloff/source/core/xmlexp.cxx | 2 +- xmloff/source/core/xmlimp.cxx | 4 ++-- xmloff/source/style/PageMasterImportPropMapper.cxx | 12 +++--------- xmloff/source/text/XMLPropertyBackpatcher.cxx | 8 +++----- xmloff/source/text/txtimppr.cxx | 8 ++------ xmloff/source/text/txtparae.cxx | 10 ++++------ 6 files changed, 15 insertions(+), 29 deletions(-) (limited to 'xmloff') 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 xFooterDynamic; XMLPropertyState* pAllMarginProperty = NULL; XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL }; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pNewMargins[4]; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr pNewMargins[4]; XMLPropertyState* pAllHeaderMarginProperty = NULL; XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL }; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pNewHeaderMargins[4]; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr pNewHeaderMargins[4]; XMLPropertyState* pAllFooterMarginProperty = NULL; XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL }; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pNewFooterMargins[4]; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr 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; struct XMLTextImportHelper::BackpatcherImpl { - SAL_WNODEPRECATED_DECLARATIONS_PUSH /// backpatcher for references to footnotes and endnotes - ::std::auto_ptr< XMLPropertyBackpatcher > + ::std::unique_ptr< XMLPropertyBackpatcher > m_pFootnoteBackpatcher; /// backpatchers for references to sequences - ::std::auto_ptr< XMLPropertyBackpatcher > + ::std::unique_ptr< XMLPropertyBackpatcher > m_pSequenceIdBackpatcher; - ::std::auto_ptr< XMLPropertyBackpatcher< OUString> > + ::std::unique_ptr< XMLPropertyBackpatcher< OUString> > m_pSequenceNameBackpatcher; - SAL_WNODEPRECATED_DECLARATIONS_POP }; ::boost::shared_ptr 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 pNewParaMargins[4]; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr pNewParaMargins[4]; XMLPropertyState* pAllMargin = 0; XMLPropertyState* pMargins[4] = { 0, 0, 0, 0 }; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pNewMargins[4]; - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr 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 m_pTexts; - auto_ptr m_pGraphics; - auto_ptr m_pEmbeddeds; - auto_ptr m_pShapes; - SAL_WNODEPRECATED_DECLARATIONS_POP + unique_ptr m_pTexts; + unique_ptr m_pGraphics; + unique_ptr m_pEmbeddeds; + unique_ptr m_pShapes; }; } -- cgit v1.2.3