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 /framework/inc/uifactory | |
| 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 'framework/inc/uifactory')
| -rw-r--r-- | framework/inc/uifactory/configurationaccessfactorymanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uifactory/factoryconfiguration.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uifactory/menubarfactory.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index 917d3d4240a4..05ae5e8ecca0 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -39,7 +39,7 @@ namespace framework { { public: ConfigurationAccess_FactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext, const OUString& _sRoot ); - virtual ~ConfigurationAccess_FactoryManager(); + virtual ~ConfigurationAccess_FactoryManager() override; void readConfigurationData(); diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 183b09cb70ec..f0d308d3d966 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -47,7 +47,7 @@ class ConfigurationAccess_ControllerFactory : // interfaces { public: ConfigurationAccess_ControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& _sRoot ); - virtual ~ConfigurationAccess_ControllerFactory(); + virtual ~ConfigurationAccess_ControllerFactory() override; void readConfigurationData(); void updateConfigurationData(); diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index 27401f889182..ca7d0ed44fc6 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -40,7 +40,7 @@ typedef ::cppu::WeakImplHelper< { public: MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~MenuBarFactory(); + virtual ~MenuBarFactory() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override |