summaryrefslogtreecommitdiff
path: root/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 /linguistic
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'linguistic')
-rw-r--r--linguistic/inc/iprcache.hxx8
-rw-r--r--linguistic/source/convdiclist.hxx4
-rw-r--r--linguistic/source/dicimp.hxx8
-rw-r--r--linguistic/source/dlistimp.hxx4
-rw-r--r--linguistic/source/gciterator.hxx4
-rw-r--r--linguistic/source/hhconvdic.hxx4
-rw-r--r--linguistic/source/hyphdsp.hxx4
-rw-r--r--linguistic/source/lngopt.hxx4
-rw-r--r--linguistic/source/lngsvcmgr.hxx4
-rw-r--r--linguistic/source/spelldsp.hxx4
-rw-r--r--linguistic/source/thesdsp.hxx4
11 files changed, 26 insertions, 26 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 095055479cd4..9b15b68362c2 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -52,8 +52,8 @@ class FlushListener :
css::uno::Reference< css::linguistic2::XLinguProperties > xPropSet;
SpellCache& mrSpellCache;
- FlushListener(const FlushListener &) SAL_DELETED_FUNCTION;
- FlushListener & operator = (const FlushListener &) SAL_DELETED_FUNCTION;
+ FlushListener(const FlushListener &) = delete;
+ FlushListener & operator = (const FlushListener &) = delete;
public:
FlushListener( SpellCache& rFO ) : mrSpellCache(rFO) {}
@@ -84,8 +84,8 @@ class SpellCache
typedef std::map< LanguageType, WordList_t > LangWordList_t;
LangWordList_t aWordLists;
- SpellCache(const SpellCache &) SAL_DELETED_FUNCTION;
- SpellCache & operator = (const SpellCache &) SAL_DELETED_FUNCTION;
+ SpellCache(const SpellCache &) = delete;
+ SpellCache & operator = (const SpellCache &) = delete;
public:
SpellCache();
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 8945e85ed5f0..cfcce7ac1b8f 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -64,8 +64,8 @@ class ConvDicList :
bool bDisposing;
- ConvDicList( const ConvDicList & ) SAL_DELETED_FUNCTION;
- ConvDicList & operator = (const ConvDicList &) SAL_DELETED_FUNCTION;
+ ConvDicList( const ConvDicList & ) = delete;
+ ConvDicList & operator = (const ConvDicList &) = delete;
ConvDicNameContainer & GetNameContainer();
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index c871cee7517d..b21f8f1d005e 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -58,8 +58,8 @@ class DictionaryNeo :
bool bIsActive;
bool bIsReadonly;
- DictionaryNeo(const DictionaryNeo &) SAL_DELETED_FUNCTION;
- DictionaryNeo & operator = (const DictionaryNeo &) SAL_DELETED_FUNCTION;
+ DictionaryNeo(const DictionaryNeo &) = delete;
+ DictionaryNeo & operator = (const DictionaryNeo &) = delete;
void launchEvent(sal_Int16 nEvent,
::com::sun::star::uno::Reference<
@@ -187,8 +187,8 @@ class DicEntry :
aReplacement; // including hyphen positions represented by "="
bool bIsNegativ;
- DicEntry(const DicEntry &) SAL_DELETED_FUNCTION;
- DicEntry & operator = (const DicEntry &) SAL_DELETED_FUNCTION;
+ DicEntry(const DicEntry &) = delete;
+ DicEntry & operator = (const DicEntry &) = delete;
static void splitDicFileWord(const OUString &rDicFileWord,
OUString &rDicWord,
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 78a772950eab..252cb90f4697 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -70,8 +70,8 @@ class DicList :
bool bDisposing;
bool bInCreation;
- DicList( const DicList & ) SAL_DELETED_FUNCTION;
- DicList & operator = (const DicList &) SAL_DELETED_FUNCTION;
+ DicList( const DicList & ) = delete;
+ DicList & operator = (const DicList &) = delete;
void _CreateDicList();
DictionaryVec_t & GetOrCreateDicList()
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 9467de83d314..8f8d289e1bc8 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -141,8 +141,8 @@ class GrammarCheckingIterator:
::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > GetUpdateAccess() const;
- GrammarCheckingIterator( const GrammarCheckingIterator & ) SAL_DELETED_FUNCTION;
- GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) SAL_DELETED_FUNCTION;
+ GrammarCheckingIterator( const GrammarCheckingIterator & ) = delete;
+ GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) = delete;
public:
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index b4ca5b943e97..ab9d02735e1e 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -33,8 +33,8 @@
class HHConvDic :
public ConvDic
{
- HHConvDic(const HHConvDic &) SAL_DELETED_FUNCTION;
- HHConvDic & operator = (const HHConvDic &) SAL_DELETED_FUNCTION;
+ HHConvDic(const HHConvDic &) = delete;
+ HHConvDic & operator = (const HHConvDic &) = delete;
public:
HHConvDic( const OUString &rName, const OUString &rMainURL );
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index 8360e32ffcc6..76c8718a3f96 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -60,8 +60,8 @@ class HyphenatorDispatcher :
LngSvcMgr &rMgr;
- HyphenatorDispatcher(const HyphenatorDispatcher &) SAL_DELETED_FUNCTION;
- HyphenatorDispatcher & operator = (const HyphenatorDispatcher &) SAL_DELETED_FUNCTION;
+ HyphenatorDispatcher(const HyphenatorDispatcher &) = delete;
+ HyphenatorDispatcher & operator = (const HyphenatorDispatcher &) = delete;
inline ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties >
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 6bedca00cf4c..3b7edae17cfa 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -84,8 +84,8 @@ class LinguProps :
bool bDisposing;
- LinguProps(const LinguProps &) SAL_DELETED_FUNCTION;
- LinguProps & operator = (const LinguProps &) SAL_DELETED_FUNCTION;
+ LinguProps(const LinguProps &) = delete;
+ LinguProps & operator = (const LinguProps &) = delete;
void launchEvent( const ::com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 1d43f1646996..efe51b83dbd6 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -109,8 +109,8 @@ class LngSvcMgr :
bool bDisposing;
- LngSvcMgr(const LngSvcMgr &) SAL_DELETED_FUNCTION;
- LngSvcMgr & operator = (const LngSvcMgr &) SAL_DELETED_FUNCTION;
+ LngSvcMgr(const LngSvcMgr &) = delete;
+ LngSvcMgr & operator = (const LngSvcMgr &) = delete;
void GetAvailableSpellSvcs_Impl();
void GetAvailableGrammarSvcs_Impl();
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 1b99c7d0aa4d..092a2e76f6ac 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -65,8 +65,8 @@ class SpellCheckerDispatcher :
mutable linguistic::SpellCache *pCache; // Spell Cache (holds known words)
CharClass * pCharClass;
- SpellCheckerDispatcher(const SpellCheckerDispatcher &) SAL_DELETED_FUNCTION;
- SpellCheckerDispatcher & operator = (const SpellCheckerDispatcher &) SAL_DELETED_FUNCTION;
+ SpellCheckerDispatcher(const SpellCheckerDispatcher &) = delete;
+ SpellCheckerDispatcher & operator = (const SpellCheckerDispatcher &) = delete;
inline linguistic::SpellCache & GetCache() const;
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index f16ee02bf101..de0eed89ac47 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -58,8 +58,8 @@ class ThesaurusDispatcher :
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties > xPropSet;
- ThesaurusDispatcher(const ThesaurusDispatcher &) SAL_DELETED_FUNCTION;
- ThesaurusDispatcher & operator = (const ThesaurusDispatcher &) SAL_DELETED_FUNCTION;
+ ThesaurusDispatcher(const ThesaurusDispatcher &) = delete;
+ ThesaurusDispatcher & operator = (const ThesaurusDispatcher &) = delete;
inline ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguProperties >