summaryrefslogtreecommitdiff
path: root/include/linguistic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/linguistic
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'include/linguistic')
-rw-r--r--include/linguistic/hyphdta.hxx4
-rw-r--r--include/linguistic/lngprophelp.hxx8
-rw-r--r--include/linguistic/misc.hxx2
-rw-r--r--include/linguistic/spelldta.hxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx
index 2e08f9026f9b..2c7479bbc423 100644
--- a/include/linguistic/hyphdta.hxx
+++ b/include/linguistic/hyphdta.hxx
@@ -44,7 +44,7 @@ class HyphenatedWord :
public:
HyphenatedWord(const OUString &rWord, sal_uInt16 nLang, sal_Int16 nHyphenationPos,
const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
- virtual ~HyphenatedWord();
+ virtual ~HyphenatedWord() override;
// XHyphenatedWord
virtual OUString SAL_CALL
@@ -90,7 +90,7 @@ public:
PossibleHyphens(const OUString &rWord, sal_uInt16 nLang,
const OUString &rHyphWord,
const css::uno::Sequence< sal_Int16 > &rPositions);
- virtual ~PossibleHyphens();
+ virtual ~PossibleHyphens() override;
// XPossibleHyphens
virtual OUString SAL_CALL
diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx
index e11b09eac1e9..ca5b631300cb 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -95,7 +95,7 @@ public:
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet,
int nAllowedEvents );
- virtual ~PropertyChgHelper();
+ virtual ~PropertyChgHelper() override;
virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals );
@@ -143,7 +143,7 @@ public:
PropertyHelper_Thes(
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
- virtual ~PropertyHelper_Thes();
+ virtual ~PropertyHelper_Thes() override;
// XPropertyChangeListener
virtual void SAL_CALL
@@ -199,7 +199,7 @@ public:
PropertyHelper_Spell(
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet );
- virtual ~PropertyHelper_Spell();
+ virtual ~PropertyHelper_Spell() override;
virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override;
@@ -273,7 +273,7 @@ public:
PropertyHelper_Hyphen(
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > &rxPropSet);
- virtual ~PropertyHelper_Hyphen();
+ virtual ~PropertyHelper_Hyphen() override;
virtual void SetTmpPropVals( const css::beans::PropertyValues &rPropVals ) override;
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index 7ba3d2fa7a69..66ec2c7af435 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -179,7 +179,7 @@ class AppExitListener :
public:
AppExitListener();
- virtual ~AppExitListener();
+ virtual ~AppExitListener() override;
virtual void AtExit() = 0;
diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx
index d390de24784a..264be909b007 100644
--- a/include/linguistic/spelldta.hxx
+++ b/include/linguistic/spelldta.hxx
@@ -69,7 +69,7 @@ public:
LNG_DLLPUBLIC SpellAlternatives();
SpellAlternatives(const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
const css::uno::Sequence< OUString > &rAlternatives );
- virtual ~SpellAlternatives();
+ virtual ~SpellAlternatives() override;
SpellAlternatives(const SpellAlternatives&) = delete;
SpellAlternatives& operator=( const SpellAlternatives& ) = delete;