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 --- include/xmloff/DocumentSettingsContext.hxx | 2 +- include/xmloff/txtparae.hxx | 4 ++-- include/xmloff/xmluconv.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') 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 *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 m_pImpl; + ::std::unique_ptr m_pImpl; public: /** constructs a SvXMLUnitConverter. The core measure unit is the -- cgit /collabora/co-23.05'>distro/collabora/co-23.05 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sw/inc/unochart.hxx
AgeCommit message (Expand)Author
2016-10-31Omit comparator which is the same as default std::less<key_type>Takeshi Abe
2016-10-05Remove _TYPED suffix from tools/link.hxx macrosStephan Bergmann
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann