summaryrefslogtreecommitdiff
path: root/svx/source/unodialogs
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 /svx/source/unodialogs
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 'svx/source/unodialogs')
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx4
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 09de3f803e91..eac4a01881f9 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -55,7 +55,7 @@ class DictionaryList : public SvSimpleTable
{
public:
DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits);
- virtual ~DictionaryList();
+ virtual ~DictionaryList() override;
virtual void dispose() override;
void init(const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary,
@@ -108,7 +108,7 @@ class ChineseDictionaryDialog : public ModalDialog
{
public:
explicit ChineseDictionaryDialog( vcl::Window* pParent );
- virtual ~ChineseDictionaryDialog();
+ virtual ~ChineseDictionaryDialog() override;
virtual void dispose() override;
//this method should be called once before calling execute
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 6687cc4ce8a0..ce4d2bb1a259 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -69,7 +69,7 @@ class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper <
{
public:
ChineseTranslation_UnoDialog();
- virtual ~ChineseTranslation_UnoDialog();
+ virtual ~ChineseTranslation_UnoDialog() override;
// lang::XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 7290c127d7e7..74262152d6c8 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -37,7 +37,7 @@ class ChineseTranslationDialog : public ModalDialog
{
public:
explicit ChineseTranslationDialog( vcl::Window* pParent );
- virtual ~ChineseTranslationDialog();
+ virtual ~ChineseTranslationDialog() override;
virtual void dispose() override;
void getSettings( bool& rbDirectionToSimplified