summaryrefslogtreecommitdiff
path: root/sw/inc/fmtcol.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /sw/inc/fmtcol.hxx
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'sw/inc/fmtcol.hxx')
-rw-r--r--sw/inc/fmtcol.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 5ab04ac1ebba..788b2d678196 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -46,8 +46,8 @@ protected:
{ SetAuto(false); }
private:
- SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION;
- const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION;
+ SwFormatColl(const SwFormatColl & ) = delete;
+ const SwFormatColl &operator=(const SwFormatColl &) = delete;
};
/// Represents the style of a paragraph.
@@ -56,7 +56,7 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
friend class SwDoc;
friend class ::sw::DocumentStylePoolManager;
- SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION;
+ SwTextFormatColl(const SwTextFormatColl & rRef) = delete;
bool mbStayAssignedToListLevelOfOutlineStyle;
@@ -196,7 +196,7 @@ public:
SwCollCondition( const SwCollCondition& rCpy );
private:
/// @@@ public copy ctor, but no copy assignment?
- SwCollCondition & operator= (const SwCollCondition &) SAL_DELETED_FUNCTION;
+ SwCollCondition & operator= (const SwCollCondition &) = delete;
public:
bool operator==( const SwCollCondition& rCmp ) const;