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 /vcl/source/uitest | |
| 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 'vcl/source/uitest')
| -rw-r--r-- | vcl/source/uitest/uno/uiobject_uno.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/uitest/uno/uitest_uno.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx b/vcl/source/uitest/uno/uiobject_uno.hxx index 33841121e880..d06e6691272d 100644 --- a/vcl/source/uitest/uno/uiobject_uno.hxx +++ b/vcl/source/uitest/uno/uiobject_uno.hxx @@ -35,7 +35,7 @@ private: public: explicit UIObjectUnoObj(std::unique_ptr<UIObject> pObj); - virtual ~UIObjectUnoObj(); + virtual ~UIObjectUnoObj() override; css::uno::Reference<css::ui::test::XUIObject> SAL_CALL getChild(const OUString& rID) throw (css::uno::RuntimeException, std::exception) override; diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx index 52700899c7a6..efaee320bfda 100644 --- a/vcl/source/uitest/uno/uitest_uno.cxx +++ b/vcl/source/uitest/uno/uitest_uno.cxx @@ -37,7 +37,7 @@ private: public: UITestUnoObj(); - virtual ~UITestUnoObj(); + virtual ~UITestUnoObj() override; void SAL_CALL executeCommand(const OUString& rCommand) throw (css::uno::RuntimeException, std::exception) override; |