summaryrefslogtreecommitdiff
path: root/stoc
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 /stoc
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 'stoc')
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx4
-rw-r--r--stoc/source/implementationregistration/implreg.cxx2
-rw-r--r--stoc/source/inspect/introspection.cxx4
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx2
-rw-r--r--stoc/source/namingservice/namingservice.cxx2
-rw-r--r--stoc/source/simpleregistry/simpleregistry.cxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 679c51a7690e..35d351a4e726 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -53,7 +53,7 @@ class NestedRegistryImpl : public WeakAggImplHelper4 < XSimpleRegistry, XInit
public:
NestedRegistryImpl( );
- ~NestedRegistryImpl();
+ virtual ~NestedRegistryImpl();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
@@ -101,7 +101,7 @@ public:
NestedKeyImpl( const OUString& aKeyName,
NestedKeyImpl* pKey);
- ~NestedKeyImpl();
+ virtual ~NestedKeyImpl();
// XRegistryKey
virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 96a4b1df33e5..8a53877eb40b 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1209,7 +1209,7 @@ class ImplementationRegistration
{
public:
ImplementationRegistration( const Reference < XComponentContext > & rSMgr );
- ~ImplementationRegistration();
+ virtual ~ImplementationRegistration();
// XServiceInfo
OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index d0844b59d15e..b3accdc0f683 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -245,7 +245,7 @@ class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject
public:
IntrospectionAccessStatic_Impl( Reference< XIdlReflection > xCoreReflection_ );
- ~IntrospectionAccessStatic_Impl()
+ virtual ~IntrospectionAccessStatic_Impl()
{
delete[] mpOrgPropertyHandleArray;
}
@@ -717,7 +717,7 @@ class ImplIntrospectionAccess : public IntrospectionAccessHelper
public:
ImplIntrospectionAccess( const Any& obj, rtl::Reference< IntrospectionAccessStatic_Impl > const & pStaticImpl_ );
- ~ImplIntrospectionAccess();
+ virtual ~ImplIntrospectionAccess();
// Methoden von XIntrospectionAccess
virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts(void)
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index ef96833db5af..0fbe3500bd92 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -59,7 +59,7 @@ class DllComponentLoader
{
public:
DllComponentLoader( const Reference<XComponentContext> & xCtx );
- ~DllComponentLoader();
+ virtual ~DllComponentLoader();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index a4cb8f36e8e1..016bb9a27a57 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -89,7 +89,7 @@ class NamingService_Impl
HashMap_OWString_Interface aMap;
public:
NamingService_Impl();
- ~NamingService_Impl();
+ virtual ~NamingService_Impl();
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index d18204c4db6a..1a926a919260 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -59,7 +59,7 @@ class SimpleRegistry:
public:
SimpleRegistry() {}
- ~SimpleRegistry() {}
+ virtual ~SimpleRegistry() {}
osl::Mutex mutex_;