diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
| commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
| tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /writerfilter | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfvalue.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 6886e4a700b7..aaf5bf713f1a 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -232,7 +232,7 @@ protected: bool inPositionV; private: - void operator =(OOXMLFastContextHandler &) SAL_DELETED_FUNCTION; + void operator =(OOXMLFastContextHandler &) = delete; /// Handles AlternateContent. Returns true, if children of the current element should be ignored. bool prepareMceContext(Token_t nElement, const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs); diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index 8a49e5d7fa93..6d7874c432f5 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -86,8 +86,8 @@ public: void setIsSubstream( bool bSubstream ); private: - OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &) SAL_DELETED_FUNCTION; - void operator =(OOXMLFastDocumentHandler &) SAL_DELETED_FUNCTION; + OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &) = delete; + void operator =(OOXMLFastDocumentHandler &) = delete; css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 3a1c77749fa9..8012734471b6 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -57,7 +57,7 @@ public: RTFShape& getShape() const; bool equals(RTFValue& rOther); private: - RTFValue& operator=(RTFValue const& rOther) SAL_DELETED_FUNCTION; + RTFValue& operator=(RTFValue const& rOther) = delete; int m_nValue; OUString m_sValue; std::shared_ptr<RTFSprms> m_pAttributes; |