diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /svtools/source/config | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'svtools/source/config')
-rw-r--r-- | svtools/source/config/colorcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/extcolorcfg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/itemholder2.hxx | 2 | ||||
-rw-r--r-- | svtools/source/config/menuoptions.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/miscopt.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/toolpanelopt.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index f2ae5918c049..4af1d69ecf86 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -74,7 +74,7 @@ class ColorConfig_Impl : public utl::ConfigItem public: explicit ColorConfig_Impl(); - virtual ~ColorConfig_Impl(); + virtual ~ColorConfig_Impl() override; void Load(const OUString& rScheme); void CommitCurrentSchemeName(); diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 2267f3efeeb3..18c1807aa862 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -80,7 +80,7 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster public: explicit ExtendedColorConfig_Impl(); - virtual ~ExtendedColorConfig_Impl(); + virtual ~ExtendedColorConfig_Impl() override; void Load(const OUString& rScheme); void CommitCurrentSchemeName(); diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index 5126fcfd93a0..a94a3dc77acb 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -41,7 +41,7 @@ class ItemHolder2 : private ItemHolderMutexBase public: ItemHolder2(); - virtual ~ItemHolder2(); + virtual ~ItemHolder2() override; static void holdConfigItem(EItem eItem); diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 8475b7c1635b..9a561c7284e8 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -72,7 +72,7 @@ class SvtMenuOptions_Impl : public ConfigItem // constructor / destructor SvtMenuOptions_Impl(); - virtual ~SvtMenuOptions_Impl(); + virtual ~SvtMenuOptions_Impl() override; // override methods of baseclass diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 356b5cfbfa49..00d283b3d872 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -101,7 +101,7 @@ private: public: SvtMiscOptions_Impl(); - virtual ~SvtMiscOptions_Impl(); + virtual ~SvtMiscOptions_Impl() override; /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx index 07aa4350d197..647037ad154f 100644 --- a/svtools/source/config/toolpanelopt.cxx +++ b/svtools/source/config/toolpanelopt.cxx @@ -59,7 +59,7 @@ class SvtToolPanelOptions_Impl : public ConfigItem public: SvtToolPanelOptions_Impl(); - virtual ~SvtToolPanelOptions_Impl(); + virtual ~SvtToolPanelOptions_Impl() override; /** called for notify of configmanager |