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 /scripting/source/basprov | |
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 'scripting/source/basprov')
-rw-r--r-- | scripting/source/basprov/baslibnode.hxx | 2 | ||||
-rw-r--r-- | scripting/source/basprov/basmethnode.hxx | 2 | ||||
-rw-r--r-- | scripting/source/basprov/basmodnode.hxx | 2 | ||||
-rw-r--r-- | scripting/source/basprov/basprov.hxx | 2 | ||||
-rw-r--r-- | scripting/source/basprov/basscript.hxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx index 0fd6174905c4..98f1a753477a 100644 --- a/scripting/source/basprov/baslibnode.hxx +++ b/scripting/source/basprov/baslibnode.hxx @@ -57,7 +57,7 @@ namespace basprov BasicManager* pBasicManager, const css::uno::Reference< css::script::XLibraryContainer >& xLibContainer, const OUString& sLibName, bool isAppScript=true ); - virtual ~BasicLibraryNodeImpl(); + virtual ~BasicLibraryNodeImpl() override; // XBrowseNode virtual OUString SAL_CALL getName( ) diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 537d15c4735e..41c45a209c5f 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -72,7 +72,7 @@ namespace basprov BasicMethodNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sScriptingContext, SbMethod* pMethod, bool isAppScript = true ); - virtual ~BasicMethodNodeImpl(); + virtual ~BasicMethodNodeImpl() override; // XInterface DECLARE_XINTERFACE() diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx index 914184c5f4b7..1be19e286603 100644 --- a/scripting/source/basprov/basmodnode.hxx +++ b/scripting/source/basprov/basmodnode.hxx @@ -51,7 +51,7 @@ namespace basprov BasicModuleNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sScriptingContext, SbModule* pModule, bool isAppScript = true ); - virtual ~BasicModuleNodeImpl(); + virtual ~BasicModuleNodeImpl() override; // XBrowseNode virtual OUString SAL_CALL getName( ) diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx index c99a536ce993..8026a5c034ca 100644 --- a/scripting/source/basprov/basprov.hxx +++ b/scripting/source/basprov/basprov.hxx @@ -67,7 +67,7 @@ namespace basprov public: explicit BasicProviderImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~BasicProviderImpl(); + virtual ~BasicProviderImpl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index 0e5d84e676f3..cf964a8cdc0a 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -77,7 +77,7 @@ namespace basprov BasicManager& documentBasicManager, const css::uno::Reference< css::document::XScriptInvocationContext >& documentScriptContext ); - virtual ~BasicScriptImpl(); + virtual ~BasicScriptImpl() override; // XInterface DECLARE_XINTERFACE() |