diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:22:49 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:36:00 +0100 |
commit | 62c73b9f60e120aed06ad972e82822cbfa0da50c (patch) | |
tree | 12a3e8b95fbd736d045963c1e7d6a595f9490ec6 /linguistic | |
parent | a5bf14ee46209496bfdf92dc0ab309786d64c2de (diff) |
loplugin:deletedspecial
Change-Id: I5b341e6fa5cf66dca9e01b728ef476257b629aeb
Diffstat (limited to 'linguistic')
-rw-r--r-- | linguistic/inc/iprcache.hxx | 10 | ||||
-rw-r--r-- | linguistic/source/convdiclist.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/dicimp.hxx | 10 | ||||
-rw-r--r-- | linguistic/source/dlistimp.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/gciterator.cxx | 1 | ||||
-rw-r--r-- | linguistic/source/gciterator.hxx | 6 | ||||
-rw-r--r-- | linguistic/source/hhconvdic.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/hyphdsp.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/lngopt.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/lngprophelp.cxx | 17 | ||||
-rw-r--r-- | linguistic/source/lngsvcmgr.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/spelldsp.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/thesdsp.hxx | 5 |
13 files changed, 26 insertions, 58 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 4298cf8610a1..855fde7998dd 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -63,9 +63,8 @@ class FlushListener : ::com::sun::star::linguistic2::XLinguProperties > xPropSet; Flushable *pFlushObj; - // don't allow to use copy-constructor and assignment-operator - FlushListener(const FlushListener &); - FlushListener & operator = (const FlushListener &); + FlushListener(const FlushListener &) SAL_DELETED_FUNCTION; + FlushListener & operator = (const FlushListener &) SAL_DELETED_FUNCTION; public: FlushListener( Flushable *pFO ); @@ -99,9 +98,8 @@ class SpellCache : typedef std::map< LanguageType, WordList_t > LangWordList_t; LangWordList_t aWordLists; - // don't allow to use copy-constructor and assignment-operator - SpellCache(const SpellCache &); - SpellCache & operator = (const SpellCache &); + SpellCache(const SpellCache &) SAL_DELETED_FUNCTION; + SpellCache & operator = (const SpellCache &) SAL_DELETED_FUNCTION; public: SpellCache(); diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 8035348442a4..c6076996aace 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -64,9 +64,8 @@ class ConvDicList : bool bDisposing; - // disallow copy-constructor and assignment-operator for now - ConvDicList( const ConvDicList & ); - ConvDicList & operator = (const ConvDicList &); + ConvDicList( const ConvDicList & ) SAL_DELETED_FUNCTION; + ConvDicList & operator = (const ConvDicList &) SAL_DELETED_FUNCTION; ConvDicNameContainer & GetNameContainer(); diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 7d19a3282d19..29b1ecbc03ea 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -59,9 +59,8 @@ class DictionaryNeo : bool bIsActive; bool bIsReadonly; - // disallow copy-constructor and assignment-operator for now - DictionaryNeo(const DictionaryNeo &); - DictionaryNeo & operator = (const DictionaryNeo &); + DictionaryNeo(const DictionaryNeo &) SAL_DELETED_FUNCTION; + DictionaryNeo & operator = (const DictionaryNeo &) SAL_DELETED_FUNCTION; void launchEvent(sal_Int16 nEvent, ::com::sun::star::uno::Reference< @@ -189,9 +188,8 @@ class DicEntry : aReplacement; // including hyphen positions represented by "=" bool bIsNegativ; - // disallow copy-constructor and assignment-operator for now - DicEntry(const DicEntry &); - DicEntry & operator = (const DicEntry &); + DicEntry(const DicEntry &) SAL_DELETED_FUNCTION; + DicEntry & operator = (const DicEntry &) SAL_DELETED_FUNCTION; void splitDicFileWord(const OUString &rDicFileWord, OUString &rDicWord, diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index 24a8fd915365..8456191b94ac 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -71,9 +71,8 @@ class DicList : bool bDisposing; bool bInCreation; - // disallow copy-constructor and assignment-operator for now - DicList( const DicList & ); - DicList & operator = (const DicList &); + DicList( const DicList & ) SAL_DELETED_FUNCTION; + DicList & operator = (const DicList &) SAL_DELETED_FUNCTION; void _CreateDicList(); DictionaryVec_t & GetOrCreateDicList() diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 1694d74a6744..cefe6805ad44 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -242,7 +242,6 @@ GrammarCheckingIterator::GrammarCheckingIterator() : m_aCurCheckedDocId(), m_bGCServicesChecked( false ), m_nDocIdCounter( 0 ), - m_nLastEndOfSentencePos( -1 ), m_aEventListeners( MyMutex::get() ), m_aNotifyListeners( MyMutex::get() ) { diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 7b3138aa19ff..bb744c16e611 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -109,7 +109,6 @@ class GrammarCheckingIterator: OUString m_aCurCheckedDocId; bool m_bGCServicesChecked; sal_Int32 m_nDocIdCounter; - sal_Int32 m_nLastEndOfSentencePos; osl::Condition m_aWakeUpThread; oslThread m_thread; @@ -142,9 +141,8 @@ class GrammarCheckingIterator: ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > GetUpdateAccess() const; - // disallow use of copy c-tor and assignment operator - GrammarCheckingIterator( const GrammarCheckingIterator & ); - GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ); + GrammarCheckingIterator( const GrammarCheckingIterator & ) SAL_DELETED_FUNCTION; + GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) SAL_DELETED_FUNCTION; public: diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index daea420666d7..9de3b6122faa 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -34,9 +34,8 @@ class HHConvDic : public ConvDic { - // disallow copy-constructor and assignment-operator for now - HHConvDic(const HHConvDic &); - HHConvDic & operator = (const HHConvDic &); + HHConvDic(const HHConvDic &) SAL_DELETED_FUNCTION; + HHConvDic & operator = (const HHConvDic &) SAL_DELETED_FUNCTION; public: HHConvDic( const OUString &rName, const OUString &rMainURL ); diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index bf4c251058dc..dd5e245b2ab8 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -60,9 +60,8 @@ class HyphenatorDispatcher : LngSvcMgr &rMgr; - // disallow copy-constructor and assignment-operator for now - HyphenatorDispatcher(const HyphenatorDispatcher &); - HyphenatorDispatcher & operator = (const HyphenatorDispatcher &); + HyphenatorDispatcher(const HyphenatorDispatcher &) SAL_DELETED_FUNCTION; + HyphenatorDispatcher & operator = (const HyphenatorDispatcher &) SAL_DELETED_FUNCTION; inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index bc2238b3a3c3..a026d79f89dd 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -87,9 +87,8 @@ class LinguProps : bool bDisposing; - // disallow copy-constructor and assignment-operator for now - LinguProps(const LinguProps &); - LinguProps & operator = (const LinguProps &); + LinguProps(const LinguProps &) SAL_DELETED_FUNCTION; + LinguProps & operator = (const LinguProps &) SAL_DELETED_FUNCTION; void launchEvent( const ::com::sun::star::beans::PropertyChangeEvent &rEvt ) const; diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 3aeb32953d70..f9a4437b832c 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -74,23 +74,6 @@ PropertyChgHelper::PropertyChgHelper( SetDefaultValues(); } - -PropertyChgHelper::PropertyChgHelper( const PropertyChgHelper &rHelper ) : - PropertyChgHelperBase(), - aLngSvcEvtListeners (GetLinguMutex()) -{ - RemoveAsPropListener(); - aPropNames = rHelper.aPropNames; - xMyEvtObj = rHelper.xMyEvtObj; - xPropSet = rHelper.xPropSet; - nEvtFlags = rHelper.nEvtFlags; - AddAsPropListener(); - - SetDefaultValues(); - GetCurrentValues(); -} - - PropertyChgHelper::~PropertyChgHelper() { } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index c3046e85df6e..3ce86a111300 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -108,9 +108,8 @@ class LngSvcMgr : bool bDisposing; - // disallow copy-constructor and assignment-operator for now - LngSvcMgr(const LngSvcMgr &); - LngSvcMgr & operator = (const LngSvcMgr &); + LngSvcMgr(const LngSvcMgr &) SAL_DELETED_FUNCTION; + LngSvcMgr & operator = (const LngSvcMgr &) SAL_DELETED_FUNCTION; void GetAvailableSpellSvcs_Impl(); void GetAvailableGrammarSvcs_Impl(); diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 3de032707917..5b975e35f793 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -67,9 +67,8 @@ class SpellCheckerDispatcher : mutable linguistic::SpellCache *pCache; // Spell Cache (holds known words) CharClass * pCharClass; - // disallow copy-constructor and assignment-operator for now - SpellCheckerDispatcher(const SpellCheckerDispatcher &); - SpellCheckerDispatcher & operator = (const SpellCheckerDispatcher &); + SpellCheckerDispatcher(const SpellCheckerDispatcher &) SAL_DELETED_FUNCTION; + SpellCheckerDispatcher & operator = (const SpellCheckerDispatcher &) SAL_DELETED_FUNCTION; inline linguistic::SpellCache & GetCache() const; diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 5b80a846cfc6..a633f181cc15 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -59,9 +59,8 @@ class ThesaurusDispatcher : ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > xPropSet; - // disallow copy-constructor and assignment-operator for now - ThesaurusDispatcher(const ThesaurusDispatcher &); - ThesaurusDispatcher & operator = (const ThesaurusDispatcher &); + ThesaurusDispatcher(const ThesaurusDispatcher &) SAL_DELETED_FUNCTION; + ThesaurusDispatcher & operator = (const ThesaurusDispatcher &) SAL_DELETED_FUNCTION; inline ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > |