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 /include | |
| parent | 38975e16ecfd900a14600f2f1383608b659d253b (diff) | |
xmloff: std::auto_ptr -> std::unique_ptr
Change-Id: I8baa6c0573af3629bacbf1891c3196c165883d9e
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/DocumentSettingsContext.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/txtparae.hxx | 4 | ||||
| -rw-r--r-- | include/xmloff/xmluconv.hxx | 2 |
3 files changed, 4 insertions, 4 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 |