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/source/uiconfiguration | |
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/source/uiconfiguration')
7 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 51e319287e53..aa8a15af8a09 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -57,7 +57,7 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper< { public: explicit GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~GlobalSettings_Access(); + virtual ~GlobalSettings_Access() override; // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index b1310f56c236..1d5022b868ff 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -77,7 +77,7 @@ namespace framework { public: explicit GlobalImageList(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - virtual ~GlobalImageList(); + virtual ~GlobalImageList() override; virtual Image getImageFromCommandURL( vcl::ImageType nImageType, const OUString& rCommandURL ) override; virtual bool hasImage( vcl::ImageType nImageType, const OUString& rCommandURL ) override; diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 2c707dc18325..f53b3584678e 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -63,7 +63,7 @@ class ModuleUIConfigurationManagerSupplier : private cppu::BaseMutex, { public: explicit ModuleUIConfigurationManagerSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~ModuleUIConfigurationManagerSupplier(); + virtual ~ModuleUIConfigurationManagerSupplier() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 5f79341edd2c..104b485570a0 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -78,7 +78,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xServiceManager, const css::uno::Sequence< css::uno::Any >& aArguments); - virtual ~ModuleUIConfigurationManager(); + virtual ~ModuleUIConfigurationManager() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index d82c24224ea6..a7319de194f0 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -61,7 +61,7 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess osl::Mutex aMutex; public: ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext ); - virtual ~ConfigurationAccess_UICategory(); + virtual ~ConfigurationAccess_UICategory() override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) @@ -373,7 +373,7 @@ class UICategoryDescription : public UICommandDescription { public: explicit UICategoryDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~UICategoryDescription(); + virtual ~UICategoryDescription() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 61056c1b35f0..33b7cd1a7ad0 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -85,7 +85,7 @@ public: } explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); - virtual ~UIConfigurationManager(); + virtual ~UIConfigurationManager() override; // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 1e6463996949..cc2a6052396d 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -104,7 +104,7 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon { public: ConfigurationAccess_WindowState( const OUString& aWindowStateConfigFile, const Reference< XComponentContext >& rxContext ); - virtual ~ConfigurationAccess_WindowState(); + virtual ~ConfigurationAccess_WindowState() override; // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) @@ -1267,7 +1267,7 @@ class WindowStateConfiguration : private cppu::BaseMutex, { public: explicit WindowStateConfiguration( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~WindowStateConfiguration(); + virtual ~WindowStateConfiguration() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override |