From a5bf14ee46209496bfdf92dc0ab309786d64c2de Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sat, 7 Feb 2015 12:22:31 +0100
Subject: loplugin:deletedspecial

Change-Id: I65d025fc465b9b1d11c43e01e2ff6796b72d6333
---
 lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 5 ++---
 lingucomponent/source/spellcheck/spell/sspellimp.hxx  | 5 ++---
 lingucomponent/source/thesaurus/libnth/nthesdta.cxx   | 5 ++---
 lingucomponent/source/thesaurus/libnth/nthesdta.hxx   | 8 +++-----
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx   | 2 +-
 lingucomponent/source/thesaurus/libnth/nthesimp.hxx   | 5 ++---
 6 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'lingucomponent')

diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index 673f046d7c17..25b7e7d93eb5 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -75,9 +75,8 @@ class Hyphenator :
     linguistic::PropertyHelper_Hyphenation* pPropHelper;
     bool                                    bDisposing;
 
-    // disallow copy-constructor and assignment-operator for now
-    Hyphenator(const Hyphenator &);
-    Hyphenator & operator = (const Hyphenator &);
+    Hyphenator(const Hyphenator &) SAL_DELETED_FUNCTION;
+    Hyphenator & operator = (const Hyphenator &) SAL_DELETED_FUNCTION;
 
     linguistic::PropertyHelper_Hyphenation& GetPropHelper_Impl();
     linguistic::PropertyHelper_Hyphenation& GetPropHelper()
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index c3dac0b40254..097471b0381e 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -66,9 +66,8 @@ class SpellChecker :
     linguistic::PropertyHelper_Spelling*    pPropHelper;
     bool                                    bDisposing;
 
-    // disallow copy-constructor and assignment-operator for now
-    SpellChecker(const SpellChecker &);
-    SpellChecker & operator = (const SpellChecker &);
+    SpellChecker(const SpellChecker &) SAL_DELETED_FUNCTION;
+    SpellChecker & operator = (const SpellChecker &) SAL_DELETED_FUNCTION;
 
     linguistic::PropertyHelper_Spelling&  GetPropHelper_Impl();
     linguistic::PropertyHelper_Spelling&  GetPropHelper()
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 6f8b937fb7bf..2f9273167bcd 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -35,11 +35,10 @@ namespace linguistic
 {
 
 Meaning::Meaning(
-            const OUString &rTerm, sal_Int16 nLang) :
+            const OUString &rTerm) :
 
     aSyn        ( Sequence< OUString >(1) ),
-    aTerm       (rTerm),
-    nLanguage   (nLang)
+    aTerm       (rTerm)
 
 {
 #if 0
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 98f2a2393b29..9e676e21244e 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -34,19 +34,17 @@ class Meaning :
 {
     ::com::sun::star::uno::Sequence< OUString >  aSyn;   // list of synonyms, may be empty.
     OUString         aTerm;
-    sal_Int16                   nLanguage;
 
 #if 0
         // this is for future use by a German thesaurus
         sal_Bool                bIsGermanPreReform;
 #endif
 
-    // disallow copy-constructor and assignment-operator for now
-    Meaning(const Meaning &);
-    Meaning & operator = (const Meaning &);
+    Meaning(const Meaning &) SAL_DELETED_FUNCTION;
+    Meaning & operator = (const Meaning &) SAL_DELETED_FUNCTION;
 
 public:
-    Meaning(const OUString &rTerm, sal_Int16 nLang);
+    Meaning(const OUString &rTerm);
     virtual ~Meaning();
 
     // XMeaning
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 994f28a14245..7ab514cfa3e3 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -443,7 +443,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes
                     OUString aAlt( cTerm + catst);
                     pStr[i] = aAlt;
                 }
-                Meaning * pMn = new Meaning(rTerm,nLanguage);
+                Meaning * pMn = new Meaning(rTerm);
                 OUString dTerm(pe->defn,strlen(pe->defn),eEnc );
                 pMn->SetMeaning(dTerm);
                 pMn->SetSynonyms(aStr);
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index c90720cbcfa3..4504b3c5c9f9 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -82,9 +82,8 @@ class Thesaurus :
     OUString  prevTerm;
     sal_Int16 prevLocale;
 
-    // disallow copy-constructor and assignment-operator for now
-    Thesaurus(const Thesaurus &);
-    Thesaurus & operator = (const Thesaurus &);
+    Thesaurus(const Thesaurus &) SAL_DELETED_FUNCTION;
+    Thesaurus & operator = (const Thesaurus &) SAL_DELETED_FUNCTION;
 
     linguistic::PropertyHelper_Thesaurus&   GetPropHelper_Impl();
     linguistic::PropertyHelper_Thesaurus&   GetPropHelper()
-- 
cgit