From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 15:25:41 +0200 Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 --- include/xmloff/DocumentSettingsContext.hxx | 4 ++-- include/xmloff/SchXMLExportHelper.hxx | 4 ++-- include/xmloff/XMLCharContext.hxx | 4 ++-- include/xmloff/prhdlfac.hxx | 4 ++-- include/xmloff/prstylei.hxx | 4 ++-- include/xmloff/txtimp.hxx | 4 ++-- include/xmloff/txtparae.hxx | 2 +- include/xmloff/xmlimppr.hxx | 4 ++-- include/xmloff/xmlprmap.hxx | 4 ++-- include/xmloff/xmlstyle.hxx | 4 ++-- include/xmloff/xmluconv.hxx | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) (limited to 'include/xmloff') diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx index f39cc200a6ca..af57413061bd 100644 --- a/include/xmloff/DocumentSettingsContext.hxx +++ b/include/xmloff/DocumentSettingsContext.hxx @@ -47,8 +47,8 @@ public: virtual void EndElement() SAL_OVERRIDE; private: - XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION; - XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) SAL_DELETED_FUNCTION; + XMLDocumentSettingsContext( const XMLDocumentSettingsContext& ) = delete; + XMLDocumentSettingsContext& operator=( const XMLDocumentSettingsContext& ) = delete; }; #endif diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx index 3585d64d1a03..36f8d402a061 100644 --- a/include/xmloff/SchXMLExportHelper.hxx +++ b/include/xmloff/SchXMLExportHelper.hxx @@ -56,8 +56,8 @@ public: void SetDestinationShellID( const OUString& rShellID ); private: - SchXMLExportHelper(SchXMLExportHelper &) SAL_DELETED_FUNCTION; - void operator =(SchXMLExportHelper &) SAL_DELETED_FUNCTION; + SchXMLExportHelper(SchXMLExportHelper &) = delete; + void operator =(SchXMLExportHelper &) = delete; private: SchXMLExportHelper_Impl* m_pImpl; diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index a07c8136b183..63fb6ff00aee 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -25,8 +25,8 @@ class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext { - XMLCharContext(const XMLCharContext&) SAL_DELETED_FUNCTION; - void operator =(const XMLCharContext&) SAL_DELETED_FUNCTION; + XMLCharContext(const XMLCharContext&) = delete; + void operator =(const XMLCharContext&) = delete; protected: sal_Int16 m_nControl; sal_uInt16 m_nCount; diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx index e5d608c8cf37..515a69cfbfe7 100644 --- a/include/xmloff/prhdlfac.hxx +++ b/include/xmloff/prhdlfac.hxx @@ -41,8 +41,8 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer struct Impl; Impl* mpImpl; - XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION; - XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) SAL_DELETED_FUNCTION; + XMLPropertyHandlerFactory( const XMLPropertyHandlerFactory& ) = delete; + XMLPropertyHandlerFactory& operator= ( const XMLPropertyHandlerFactory& ) = delete; public: XMLPropertyHandlerFactory(); diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 8ce29d50ed2b..db250e1f69b3 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -54,8 +54,8 @@ private: static OldFillStyleDefinitionSet maFooterSet; static OldFillStyleDefinitionSet maParaSet; - XMLPropStyleContext(XMLPropStyleContext &) SAL_DELETED_FUNCTION; - void operator =(XMLPropStyleContext &) SAL_DELETED_FUNCTION; + XMLPropStyleContext(XMLPropStyleContext &) = delete; + void operator =(XMLPropStyleContext &) = delete; protected: diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 9783a9bed237..d507e508f926 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -368,8 +368,8 @@ enum XMLTextType class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject { private: - XMLTextImportHelper(const XMLTextImportHelper&) SAL_DELETED_FUNCTION; - XMLTextImportHelper& operator=(const XMLTextImportHelper&) SAL_DELETED_FUNCTION; + XMLTextImportHelper(const XMLTextImportHelper&) = delete; + XMLTextImportHelper& operator=(const XMLTextImportHelper&) = delete; struct Impl; std::unique_ptr m_xImpl; diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 96c2afc48174..68e23c66ac13 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -673,7 +673,7 @@ public: void PopTextListsHelper(); private: - XMLTextParagraphExport(XMLTextParagraphExport &) SAL_DELETED_FUNCTION; + XMLTextParagraphExport(XMLTextParagraphExport &) = delete; }; inline const XMLTextListAutoStylePool& diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 59807ecd0216..9011c21a3645 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -57,8 +57,8 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleRefer SvXMLImport& rImport; // access to error handling - SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION; - void operator =(SvXMLImportPropertyMapper &) SAL_DELETED_FUNCTION; + SvXMLImportPropertyMapper(SvXMLImportPropertyMapper &) = delete; + void operator =(SvXMLImportPropertyMapper &) = delete; protected: diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index 569adfa6552b..7fc7a720a27f 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -39,8 +39,8 @@ class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceO Impl* mpImpl; - XMLPropertySetMapper( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION; - XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) SAL_DELETED_FUNCTION; + XMLPropertySetMapper( const XMLPropertySetMapper& ) = delete; + XMLPropertySetMapper& operator= ( const XMLPropertySetMapper& ) = delete; public: /** The last element of the XMLPropertyMapEntry-array must contain NULL-values. diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 7c24399ac7c3..92fa85c4a4ec 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -183,8 +183,8 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap(); - SvXMLStylesContext(SvXMLStylesContext &) SAL_DELETED_FUNCTION; - void operator =(SvXMLStylesContext &) SAL_DELETED_FUNCTION; + SvXMLStylesContext(SvXMLStylesContext &) = delete; + void operator =(SvXMLStylesContext &) = delete; protected: diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 94f8c43f18b8..74bc8143c519 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -78,8 +78,8 @@ public: class XMLOFF_DLLPUBLIC SvXMLUnitConverter { private: - SvXMLUnitConverter(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION; - SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) SAL_DELETED_FUNCTION; + SvXMLUnitConverter(const SvXMLUnitConverter&) = delete; + SvXMLUnitConverter& operator=(const SvXMLUnitConverter&) = delete; struct Impl; ::std::unique_ptr m_pImpl; -- cgit