summaryrefslogtreecommitdiff
path: root/include/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /include/unotools
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'include/unotools')
-rw-r--r--include/unotools/componentresmodule.hxx2
-rw-r--r--include/unotools/confignode.hxx2
-rw-r--r--include/unotools/eventcfg.hxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index c87268176c54..b663a770ffe7 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -51,7 +51,7 @@ namespace utl
public:
OComponentResourceModule( const OString& _rResFilePrefix );
- ~OComponentResourceModule();
+ virtual ~OComponentResourceModule();
/// get the vcl res manager of the module
ResMgr* getResManager();
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index d269ecbb6b26..435c27d1cb00 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -85,7 +85,7 @@ namespace utl
const OConfigurationNode& operator=(const OConfigurationNode& _rSource);
/// dtor
- ~OConfigurationNode() {}
+ virtual ~OConfigurationNode() {}
/// returns the local name of the node
OUString getLocalName() const;
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 4f0c600352e1..0564f0649761 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -72,7 +72,7 @@ class GlobalEventConfig_Impl : public utl::ConfigItem
public:
GlobalEventConfig_Impl( );
- ~GlobalEventConfig_Impl( );
+ virtual ~GlobalEventConfig_Impl( );
void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
void Commit() SAL_OVERRIDE;
@@ -91,7 +91,7 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig:
{
public:
GlobalEventConfig( );
- ~GlobalEventConfig( );
+ virtual ~GlobalEventConfig( );
static ::osl::Mutex& GetOwnStaticMutex();
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;