summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-12-02 11:15:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-12-02 11:15:56 +0100
commitad91fa995e0af5f0191ee327fe936160081bbf05 (patch)
treeb24c4c267ccb1813e988f29097353043b2cbdce3 /stoc
parentb610d25131cc29bd6906e7b380147d60488bd4f4 (diff)
loplugin:unnecessaryoverride (dtors) in stoc
Change-Id: I60652dbac6a76eacdbb4e951a636e7a40e88a6a6
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/corereflection/crenum.cxx5
-rw-r--r--stoc/source/defaultregistry/defaultregistry.cxx13
-rw-r--r--stoc/source/implementationregistration/implreg.cxx6
-rw-r--r--stoc/source/inspect/introspection.cxx6
-rw-r--r--stoc/source/invocation/invocation.cxx7
-rw-r--r--stoc/source/javaloader/javaloader.cxx5
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx5
-rw-r--r--stoc/source/namingservice/namingservice.cxx4
-rw-r--r--stoc/source/proxy_factory/proxyfac.cxx11
-rw-r--r--stoc/source/security/access_controller.cxx19
-rw-r--r--stoc/source/security/file_policy.cxx4
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx21
-rw-r--r--stoc/source/simpleregistry/simpleregistry.cxx2
-rw-r--r--stoc/source/typeconv/convert.cxx3
14 files changed, 0 insertions, 111 deletions
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index 1b23133a4a6a..74c7a565bdca 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -42,7 +42,6 @@ public:
: IdlMemberImpl( pReflection, rName, pTypeDescr, pTypeDescr )
, _nValue( nValue )
{}
- virtual ~IdlEnumFieldImpl() override;
// XInterface
virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
@@ -65,10 +64,6 @@ public:
virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
};
-IdlEnumFieldImpl::~IdlEnumFieldImpl()
-{
-}
-
// XInterface
Any IdlEnumFieldImpl::queryInterface( const Type & rType )
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 2885ccaad430..75ee807f335b 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -52,8 +52,6 @@ class NestedRegistryImpl : public WeakAggImplHelper4 < XSimpleRegistry, XInit
public:
NestedRegistryImpl( );
- virtual ~NestedRegistryImpl() override;
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override;
@@ -100,8 +98,6 @@ public:
NestedKeyImpl( const OUString& aKeyName,
NestedKeyImpl* pKey);
- virtual ~NestedKeyImpl() override;
-
// XRegistryKey
virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception) override;
@@ -191,12 +187,6 @@ NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName,
m_state = m_xRegistry->m_state;
}
-
-NestedKeyImpl::~NestedKeyImpl()
-{
-}
-
-
void NestedKeyImpl::computeChanges()
{
Guard< Mutex > aGuard( m_xRegistry->m_mutex );
@@ -1106,9 +1096,6 @@ NestedRegistryImpl::NestedRegistryImpl( )
: m_state(0)
{}
-
-NestedRegistryImpl::~NestedRegistryImpl() {}
-
class RegistryEnumueration : public WeakImplHelper< XEnumeration >
{
public:
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index f01737a651a1..e174724df572 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1196,7 +1196,6 @@ class ImplementationRegistration
{
public:
explicit ImplementationRegistration( const Reference < XComponentContext > & rSMgr );
- virtual ~ImplementationRegistration() override;
// XServiceInfo
OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override;
@@ -1277,11 +1276,6 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo
, m_xCtx( xCtx )
{}
-
-// ~ImplementationRegistration()
-
-ImplementationRegistration::~ImplementationRegistration() {}
-
// XServiceInfo
OUString ImplementationRegistration::getImplementationName() throw(RuntimeException, std::exception)
{
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index a755443f19c2..9043ded5416c 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -707,7 +707,6 @@ class ImplIntrospectionAccess : public IntrospectionAccessHelper
public:
ImplIntrospectionAccess( const Any& obj, rtl::Reference< IntrospectionAccessStatic_Impl > const & pStaticImpl_ );
- virtual ~ImplIntrospectionAccess() override;
// Methods from XIntrospectionAccess
virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts()
@@ -832,11 +831,6 @@ ImplIntrospectionAccess::ImplIntrospectionAccess
mnLastMethodConcept = -1;
}
-ImplIntrospectionAccess::~ImplIntrospectionAccess()
-{
-}
-
-
Reference<XElementAccess> ImplIntrospectionAccess::getXElementAccess()
{
ResettableGuard< Mutex > aGuard( m_aMutex );
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 99ec15e5c47d..9f965dcfef2a 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -99,7 +99,6 @@ public:
Invocation_Impl( const Any & rAdapted, const Reference<XTypeConverter> &,
const Reference<XIntrospection> &,
const Reference<XIdlReflection> & );
- virtual ~Invocation_Impl() override;
// XInterface
virtual Any SAL_CALL queryInterface( const Type & aType) throw( RuntimeException, std::exception ) override;
@@ -246,9 +245,6 @@ Invocation_Impl::Invocation_Impl
setMaterial( rAdapted );
}
-Invocation_Impl::~Invocation_Impl() {}
-
-
//### INTERFACE IMPLEMENTATIONS ####################################################################
@@ -1072,7 +1068,6 @@ class InvocationService
{
public:
explicit InvocationService( const Reference<XComponentContext> & xCtx );
- virtual ~InvocationService() override;
// XServiceInfo
OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
@@ -1102,8 +1097,6 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx
xIntrospection = theIntrospection::get(xCtx);
}
-InvocationService::~InvocationService() {}
-
// XServiceInfo
OUString InvocationService::getImplementationName() throw( RuntimeException, std::exception )
{
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 48d88e9fe60b..f625f610b7ef 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -102,7 +102,6 @@ class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServic
public:
explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx)
throw(RuntimeException);
- virtual ~JavaComponentLoader() throw() override;
public:
// XServiceInfo
@@ -296,10 +295,6 @@ JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentCon
}
-JavaComponentLoader::~JavaComponentLoader() throw()
-{
-}
-
// XServiceInfo
OUString SAL_CALL JavaComponentLoader::getImplementationName()
throw(css::uno::RuntimeException, std::exception)
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index a443e64fdfd0..8b765f41515e 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -59,7 +59,6 @@ class DllComponentLoader
{
public:
explicit DllComponentLoader( const Reference<XComponentContext> & xCtx );
- virtual ~DllComponentLoader() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
@@ -83,10 +82,6 @@ DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCt
m_xSMgr.set( xCtx->getServiceManager(), UNO_QUERY );
}
-
-DllComponentLoader::~DllComponentLoader() {}
-
-
OUString SAL_CALL DllComponentLoader::getImplementationName( )
throw(css::uno::RuntimeException, std::exception)
{
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 40af05079ae1..8e3fda8c8f57 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -76,7 +76,6 @@ class NamingService_Impl
HashMap_OWString_Interface aMap;
public:
NamingService_Impl();
- virtual ~NamingService_Impl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
@@ -101,9 +100,6 @@ static Reference<XInterface> SAL_CALL NamingService_Impl_create(
NamingService_Impl::NamingService_Impl() {}
-
-NamingService_Impl::~NamingService_Impl() {}
-
// XServiceInfo
OUString NamingService_Impl::getImplementationName()
throw(css::uno::RuntimeException, std::exception)
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 6006907d3aa5..b60af0b4d878 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -75,7 +75,6 @@ struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo,
typelib_InterfaceTypeDescription * pTypeDescr );
FactoryImpl();
- virtual ~FactoryImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
@@ -169,7 +168,6 @@ struct ProxyRoot : public ::cppu::OWeakAggObject
virtual Any SAL_CALL queryAggregation( Type const & rType )
throw (RuntimeException, std::exception) override;
- virtual ~ProxyRoot() override;
inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory,
Reference< XInterface > const & xTarget );
@@ -303,12 +301,6 @@ inline binuno_Proxy::binuno_Proxy(
uno_Interface::pDispatcher = binuno_proxy_dispatch;
}
-
-ProxyRoot::~ProxyRoot()
-{
-}
-
-
inline ProxyRoot::ProxyRoot(
::rtl::Reference< FactoryImpl > const & factory,
Reference< XInterface > const & xTarget )
@@ -417,9 +409,6 @@ FactoryImpl::FactoryImpl()
OSL_ENSURE( m_cpp2uno.is(), "### cannot get bridge C++ <-> uno!" );
}
-
-FactoryImpl::~FactoryImpl() {}
-
// XProxyFactory
Reference< XAggregation > FactoryImpl::createProxy(
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 11e0fcdfd0a4..246ea6fb3573 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -79,8 +79,6 @@ class acc_Intersection
Reference< security::XAccessControlContext > const & x2 );
public:
- virtual ~acc_Intersection() override;
-
static inline Reference< security::XAccessControlContext > create(
Reference< security::XAccessControlContext > const & x1,
Reference< security::XAccessControlContext > const & x2 );
@@ -98,9 +96,6 @@ inline acc_Intersection::acc_Intersection(
, m_x2( x2 )
{}
-acc_Intersection::~acc_Intersection()
-{}
-
inline Reference< security::XAccessControlContext > acc_Intersection::create(
Reference< security::XAccessControlContext > const & x1,
Reference< security::XAccessControlContext > const & x2 )
@@ -132,8 +127,6 @@ class acc_Union
Reference< security::XAccessControlContext > const & x2 );
public:
- virtual ~acc_Union() override;
-
static inline Reference< security::XAccessControlContext > create(
Reference< security::XAccessControlContext > const & x1,
Reference< security::XAccessControlContext > const & x2 );
@@ -151,9 +144,6 @@ inline acc_Union::acc_Union(
, m_x2( x2 )
{}
-acc_Union::~acc_Union()
-{}
-
inline Reference< security::XAccessControlContext > acc_Union::create(
Reference< security::XAccessControlContext > const & x1,
Reference< security::XAccessControlContext > const & x2 )
@@ -192,17 +182,12 @@ public:
: m_permissions( permissions )
{}
- virtual ~acc_Policy() override;
-
// XAccessControlContext impl
virtual void SAL_CALL checkPermission(
Any const & perm )
throw (RuntimeException, std::exception) override;
};
-acc_Policy::~acc_Policy()
-{}
-
void acc_Policy::checkPermission(
Any const & perm )
throw (RuntimeException, std::exception)
@@ -338,7 +323,6 @@ protected:
public:
explicit AccessController( Reference< XComponentContext > const & xComponentContext );
- virtual ~AccessController() override;
// XInitialization impl
virtual void SAL_CALL initialize(
@@ -431,9 +415,6 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
}
}
-AccessController::~AccessController()
-{}
-
void AccessController::disposing()
{
m_mode = OFF; // avoid checks from now on xxx todo review/ better DYNAMIC_ONLY?
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 212e506002ef..bc3f3fe0e0be 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -72,7 +72,6 @@ protected:
public:
explicit FilePolicy( Reference< XComponentContext > const & xComponentContext );
- virtual ~FilePolicy() override;
// XPolicy impl
virtual Sequence< Any > SAL_CALL getPermissions(
@@ -99,9 +98,6 @@ FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext
, m_init( false )
{}
-FilePolicy::~FilePolicy()
-{}
-
void FilePolicy::disposing()
{
m_userPermissions.clear();
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 3dd9274d5b07..f47b0b0b5923 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -161,7 +161,6 @@ public:
: aFactories( rFactories )
, nIt( 0 )
{}
- virtual ~ServiceEnumeration_Impl() override {}
// XEnumeration
sal_Bool SAL_CALL hasMoreElements()
@@ -253,7 +252,6 @@ public:
: aImplementationMap( rImplementationMap )
, aIt( aImplementationMap.begin() )
{}
- virtual ~ImplementationEnumeration_Impl() override;
// XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
@@ -267,8 +265,6 @@ private:
HashSet_Ref::iterator aIt;
};
-ImplementationEnumeration_Impl::~ImplementationEnumeration_Impl() {}
-
// XEnumeration
sal_Bool ImplementationEnumeration_Impl::hasMoreElements()
throw(css::uno::RuntimeException, std::exception)
@@ -372,7 +368,6 @@ class OServiceManager
{
public:
explicit OServiceManager( Reference< XComponentContext > const & xContext );
- virtual ~OServiceManager() override;
// XInitialization
void SAL_CALL initialize( Sequence< Any > const & args )
@@ -512,7 +507,6 @@ protected:
public:
explicit OServiceManagerWrapper(
Reference< XComponentContext > const & xContext );
- virtual ~OServiceManagerWrapper() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override
@@ -642,8 +636,6 @@ void OServiceManagerWrapper::disposing()
m_root.clear();
}
-OServiceManagerWrapper::~OServiceManagerWrapper() {}
-
OServiceManagerWrapper::OServiceManagerWrapper(
Reference< XComponentContext > const & xContext )
: t_OServiceManagerWrapper_impl( m_mutex )
@@ -667,11 +659,6 @@ OServiceManager::OServiceManager( Reference< XComponentContext > const & xContex
, m_bInDisposing( false )
{}
-/**
- * Destroy the ServiceManager
- */
-OServiceManager::~OServiceManager() {}
-
// XComponent
void OServiceManager::dispose()
throw(css::uno::RuntimeException, std::exception)
@@ -1270,7 +1257,6 @@ class ORegistryServiceManager : public OServiceManager
{
public:
explicit ORegistryServiceManager( Reference< XComponentContext > const & xContext );
- virtual ~ORegistryServiceManager() override;
// XInitialization
void SAL_CALL initialize(const Sequence< Any >& Arguments)
@@ -1332,13 +1318,6 @@ ORegistryServiceManager::ORegistryServiceManager( Reference< XComponentContext >
{
}
-/**
- * Destroy the ServiceManager
- */
-ORegistryServiceManager::~ORegistryServiceManager()
-{
-}
-
// XComponent
void ORegistryServiceManager::dispose()
throw(css::uno::RuntimeException, std::exception)
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 3dd67ce2ba81..c48913fcab80 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -58,8 +58,6 @@ class SimpleRegistry:
public:
SimpleRegistry() {}
- virtual ~SimpleRegistry() override {}
-
osl::Mutex mutex_;
private:
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 214d24a31e9b..59849df3ae4d 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -251,7 +251,6 @@ class TypeConverter_Impl : public WeakImplHelper< XTypeConverter, XServiceInfo >
public:
TypeConverter_Impl();
- virtual ~TypeConverter_Impl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override;
@@ -269,8 +268,6 @@ public:
TypeConverter_Impl::TypeConverter_Impl() {}
-TypeConverter_Impl::~TypeConverter_Impl() {}
-
// XServiceInfo
OUString TypeConverter_Impl::getImplementationName() throw( RuntimeException, std::exception )
{