diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 08:13:36 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 08:13:48 +0200 |
commit | 68daa8a22611605299ac3174a3632191f93236d9 (patch) | |
tree | fdfb7c512a61bf4543e056191dfeb3e6f276ac13 /xmloff/source/text | |
parent | 38975e16ecfd900a14600f2f1383608b659d253b (diff) |
xmloff: std::auto_ptr -> std::unique_ptr
Change-Id: I8baa6c0573af3629bacbf1891c3196c165883d9e
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/XMLPropertyBackpatcher.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/txtimppr.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 10 |
3 files changed, 9 insertions, 17 deletions
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; }; } |