summaryrefslogtreecommitdiff
path: root/include/linguistic
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 /include/linguistic
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/linguistic')
-rw-r--r--include/linguistic/hyphdta.hxx8
-rw-r--r--include/linguistic/lngprophelp.hxx16
2 files changed, 12 insertions, 12 deletions
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 14768ca9700b..af0cb3bd54c2 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -41,8 +41,8 @@ class HyphenatedWord :
sal_Int16 nLanguage;
bool bIsAltSpelling;
- HyphenatedWord(const HyphenatedWord &) SAL_DELETED_FUNCTION;
- HyphenatedWord & operator = (const HyphenatedWord &) SAL_DELETED_FUNCTION;
+ HyphenatedWord(const HyphenatedWord &) = delete;
+ HyphenatedWord & operator = (const HyphenatedWord &) = delete;
public:
HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
@@ -86,8 +86,8 @@ class PossibleHyphens :
::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos;
sal_Int16 nLanguage;
- PossibleHyphens(const PossibleHyphens &) SAL_DELETED_FUNCTION;
- PossibleHyphens & operator = (const PossibleHyphens &) SAL_DELETED_FUNCTION;
+ PossibleHyphens(const PossibleHyphens &) = delete;
+ PossibleHyphens & operator = (const PossibleHyphens &) = delete;
public:
PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index 75780566766c..ce8c6b73bca3 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -75,8 +75,8 @@ class PropertyChgHelper :
bool bResIsIgnoreControlCharacters;
bool bResIsUseDictionaryList;
- PropertyChgHelper( const PropertyChgHelper & ) SAL_DELETED_FUNCTION;
- PropertyChgHelper & operator = ( const PropertyChgHelper & ) SAL_DELETED_FUNCTION;
+ PropertyChgHelper( const PropertyChgHelper & ) = delete;
+ PropertyChgHelper & operator = ( const PropertyChgHelper & ) = delete;
protected:
virtual void SetDefaultValues();
@@ -146,8 +146,8 @@ public:
class PropertyHelper_Thes :
public PropertyChgHelper
{
- PropertyHelper_Thes( const PropertyHelper_Thes & ) SAL_DELETED_FUNCTION;
- PropertyHelper_Thes & operator = ( const PropertyHelper_Thes & ) SAL_DELETED_FUNCTION;
+ PropertyHelper_Thes( const PropertyHelper_Thes & ) = delete;
+ PropertyHelper_Thes & operator = ( const PropertyHelper_Thes & ) = delete;
public:
PropertyHelper_Thes(
@@ -199,8 +199,8 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
bool bResIsSpellWithDigits;
bool bResIsSpellCapitalization;
- PropertyHelper_Spell( const PropertyHelper_Spell & ) SAL_DELETED_FUNCTION;
- PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) SAL_DELETED_FUNCTION;
+ PropertyHelper_Spell( const PropertyHelper_Spell & ) = delete;
+ PropertyHelper_Spell & operator = ( const PropertyHelper_Spell & ) = delete;
protected:
// PropertyChgHelper
@@ -279,8 +279,8 @@ class PropertyHelper_Hyphen :
nResHyphMinTrailing,
nResHyphMinWordLength;
- PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) SAL_DELETED_FUNCTION;
- PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) SAL_DELETED_FUNCTION;
+ PropertyHelper_Hyphen( const PropertyHelper_Hyphen & ) = delete;
+ PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & ) = delete;
protected:
// PropertyChgHelper