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 /editeng | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editattr.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj2.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/textconv.hxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index d34d3c2c4c65..2d17144221c2 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -364,7 +364,7 @@ class EditCharAttribField: public EditCharAttrib Color* pTxtColor; Color* pFldColor; - EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) SAL_DELETED_FUNCTION; + EditCharAttribField& operator = ( const EditCharAttribField& rAttr ) = delete; public: EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos ); diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 218fc3503049..35544631464b 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -603,7 +603,7 @@ private: bool bVisible : 1; // Belongs to the node! bool bForceRepaint : 1; - ParaPortion( const ParaPortion& ) SAL_DELETED_FUNCTION; + ParaPortion( const ParaPortion& ) = delete; public: ParaPortion( ContentNode* pNode ); diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 2d59974db893..33b709385ac8 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -51,7 +51,7 @@ private: sal_uInt16 nStart; sal_uInt16 nEnd; - XEditAttribute( const XEditAttribute& rCopyFrom ) SAL_DELETED_FUNCTION; + XEditAttribute( const XEditAttribute& rCopyFrom ) = delete; public: XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd ); diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index 3ed3c4f5d6d1..c52d73071563 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -68,8 +68,8 @@ class TextConvWrapper : public editeng::HangulHanjaConversion ESelection *pESelection ); void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes ); - TextConvWrapper (const TextConvWrapper &) SAL_DELETED_FUNCTION; - TextConvWrapper & operator= (const TextConvWrapper &) SAL_DELETED_FUNCTION; + TextConvWrapper (const TextConvWrapper &) = delete; + TextConvWrapper & operator= (const TextConvWrapper &) = delete; protected: virtual void GetNextPortion( OUString& /* [out] */ rNextPortion, |