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 /stoc | |
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 'stoc')
26 files changed, 46 insertions, 46 deletions
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index cdfcb3f2f7b1..b92da9a59866 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -102,7 +102,7 @@ public: // ctor/ dtor explicit IdlReflectionServiceImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~IdlReflectionServiceImpl(); + virtual ~IdlReflectionServiceImpl() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -154,7 +154,7 @@ public: IdlClassImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName, typelib_TypeClass eTypeClass, typelib_TypeDescription * pTypeDescr ); - virtual ~IdlClassImpl(); + virtual ~IdlClassImpl() override; // XIdlClassImpl default implementation virtual css::uno::TypeClass SAL_CALL getTypeClass() throw(css::uno::RuntimeException, std::exception) override; @@ -212,7 +212,7 @@ public: , _nMethods( 0 ) , _nAttributes( 0 ) {} - virtual ~InterfaceIdlClassImpl(); + virtual ~InterfaceIdlClassImpl() override; // IdlClassImpl modifications virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override; @@ -245,7 +245,7 @@ public: : IdlClassImpl( pReflection, rName, eTypeClass, pTypeDescr ) , _pFields( nullptr ) {} - virtual ~CompoundIdlClassImpl(); + virtual ~CompoundIdlClassImpl() override; // IdlClassImpl modifications virtual sal_Bool SAL_CALL isAssignableFrom( const css::uno::Reference< css::reflection::XIdlClass > & xType ) throw(css::uno::RuntimeException, std::exception) override; @@ -308,7 +308,7 @@ public: : IdlClassImpl( pReflection, rName, eTypeClass, pTypeDescr ) , _pFields( nullptr ) {} - virtual ~EnumIdlClassImpl(); + virtual ~EnumIdlClassImpl() override; // IdlClassImpl modifications virtual css::uno::Reference< css::reflection::XIdlField > SAL_CALL getField( const OUString & rName ) throw(css::uno::RuntimeException, std::exception) override; @@ -340,7 +340,7 @@ public: // ctor/ dtor IdlMemberImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName, typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pDeclTypeDescr ); - virtual ~IdlMemberImpl(); + virtual ~IdlMemberImpl() override; // XIdlMember virtual css::uno::Reference< css::reflection::XIdlClass > SAL_CALL getDeclaringClass() throw(css::uno::RuntimeException, std::exception) override; diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 21d4159c63da..1b23133a4a6a 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -42,7 +42,7 @@ public: : IdlMemberImpl( pReflection, rName, pTypeDescr, pTypeDescr ) , _nValue( nValue ) {} - virtual ~IdlEnumFieldImpl(); + virtual ~IdlEnumFieldImpl() override; // XInterface virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 91d42ae34d1a..d61123cc1558 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -339,7 +339,7 @@ public: , _pParamTypes( nullptr ) , _pParamInfos( nullptr ) {} - virtual ~IdlInterfaceMethodImpl(); + virtual ~IdlInterfaceMethodImpl() override; // XInterface virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 45dc8482291a..2885ccaad430 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -52,7 +52,7 @@ class NestedRegistryImpl : public WeakAggImplHelper4 < XSimpleRegistry, XInit public: NestedRegistryImpl( ); - virtual ~NestedRegistryImpl(); + virtual ~NestedRegistryImpl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; @@ -100,7 +100,7 @@ public: NestedKeyImpl( const OUString& aKeyName, NestedKeyImpl* pKey); - virtual ~NestedKeyImpl(); + virtual ~NestedKeyImpl() override; // XRegistryKey virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override; diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index b5b21cbfc8bf..3ede86fb2836 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1196,7 +1196,7 @@ class ImplementationRegistration { public: explicit ImplementationRegistration( const Reference < XComponentContext > & rSMgr ); - virtual ~ImplementationRegistration(); + virtual ~ImplementationRegistration() override; // XServiceInfo OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 2a59f2455b7b..081983f452ac 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -230,7 +230,7 @@ class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject public: explicit IntrospectionAccessStatic_Impl( Reference< XIdlReflection > const & xCoreReflection_ ); - virtual ~IntrospectionAccessStatic_Impl() + virtual ~IntrospectionAccessStatic_Impl() override { delete[] mpOrgPropertyHandleArray; } @@ -708,7 +708,7 @@ class ImplIntrospectionAccess : public IntrospectionAccessHelper public: ImplIntrospectionAccess( const Any& obj, rtl::Reference< IntrospectionAccessStatic_Impl > const & pStaticImpl_ ); - virtual ~ImplIntrospectionAccess(); + virtual ~ImplIntrospectionAccess() override; // Methods from XIntrospectionAccess virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts() diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 207797a61d4b..99ec15e5c47d 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -99,7 +99,7 @@ public: Invocation_Impl( const Any & rAdapted, const Reference<XTypeConverter> &, const Reference<XIntrospection> &, const Reference<XIdlReflection> & ); - virtual ~Invocation_Impl(); + virtual ~Invocation_Impl() override; // XInterface virtual Any SAL_CALL queryInterface( const Type & aType) throw( RuntimeException, std::exception ) override; @@ -1072,7 +1072,7 @@ class InvocationService { public: explicit InvocationService( const Reference<XComponentContext> & xCtx ); - virtual ~InvocationService(); + virtual ~InvocationService() override; // XServiceInfo OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index d66afabfa870..055ed2f415ae 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -100,7 +100,7 @@ public: t_ptr_map m_receiver2adapters; explicit FactoryImpl( Reference< XComponentContext > const & xContext ); - virtual ~FactoryImpl(); + virtual ~FactoryImpl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 6355db4ad10b..48d88e9fe60b 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -102,7 +102,7 @@ class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServic public: explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) throw(RuntimeException); - virtual ~JavaComponentLoader() throw(); + virtual ~JavaComponentLoader() throw() override; public: // XServiceInfo diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index c2962d021e46..5e20d3d603c5 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -43,7 +43,7 @@ public: virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) override {} private: - virtual inline ~AbortContinuation() {} + virtual inline ~AbortContinuation() override {} }; } @@ -61,7 +61,7 @@ public: bool isSelected() const; private: - virtual inline ~RetryContinuation() {} + virtual inline ~RetryContinuation() override {} mutable osl::Mutex m_aMutex; bool m_bSelected; diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx index e4a2fc3e63b3..8977b4449416 100644 --- a/stoc/source/javavm/interact.hxx +++ b/stoc/source/javavm/interact.hxx @@ -54,7 +54,7 @@ private: InteractionRequest(InteractionRequest &) = delete; void operator =(const InteractionRequest&) = delete; - virtual ~InteractionRequest(); + virtual ~InteractionRequest() override; css::uno::Any m_aRequest; css::uno::Sequence< css::uno::Reference< diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index dcba929e87d2..abf287f9c595 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -125,7 +125,7 @@ public: private: inline SingletonFactory() {} - virtual inline ~SingletonFactory() {} + virtual inline ~SingletonFactory() override {} SingletonFactory(const SingletonFactory&) = delete; SingletonFactory& operator=(const SingletonFactory&) = delete; diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index e2cb12dea799..8e354a8c1a35 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -122,7 +122,7 @@ private: JavaVirtualMachine(JavaVirtualMachine &) = delete; void operator =(const JavaVirtualMachine&) = delete; - virtual ~JavaVirtualMachine(); + virtual ~JavaVirtualMachine() override; virtual void SAL_CALL disposing() override; diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 01cf1d700a7f..a443e64fdfd0 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -59,7 +59,7 @@ class DllComponentLoader { public: explicit DllComponentLoader( const Reference<XComponentContext> & xCtx ); - virtual ~DllComponentLoader(); + virtual ~DllComponentLoader() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 99426ea03151..40af05079ae1 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -76,7 +76,7 @@ class NamingService_Impl HashMap_OWString_Interface aMap; public: NamingService_Impl(); - virtual ~NamingService_Impl(); + virtual ~NamingService_Impl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 6153062a0336..6006907d3aa5 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -75,7 +75,7 @@ struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo, typelib_InterfaceTypeDescription * pTypeDescr ); FactoryImpl(); - virtual ~FactoryImpl(); + virtual ~FactoryImpl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -169,7 +169,7 @@ struct ProxyRoot : public ::cppu::OWeakAggObject virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) override; - virtual ~ProxyRoot(); + virtual ~ProxyRoot() override; inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory, Reference< XInterface > const & xTarget ); diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 51094ed880dc..11e0fcdfd0a4 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -79,7 +79,7 @@ class acc_Intersection Reference< security::XAccessControlContext > const & x2 ); public: - virtual ~acc_Intersection(); + virtual ~acc_Intersection() override; static inline Reference< security::XAccessControlContext > create( Reference< security::XAccessControlContext > const & x1, @@ -132,7 +132,7 @@ class acc_Union Reference< security::XAccessControlContext > const & x2 ); public: - virtual ~acc_Union(); + virtual ~acc_Union() override; static inline Reference< security::XAccessControlContext > create( Reference< security::XAccessControlContext > const & x1, @@ -192,7 +192,7 @@ public: : m_permissions( permissions ) {} - virtual ~acc_Policy(); + virtual ~acc_Policy() override; // XAccessControlContext impl virtual void SAL_CALL checkPermission( @@ -338,7 +338,7 @@ protected: public: explicit AccessController( Reference< XComponentContext > const & xComponentContext ); - virtual ~AccessController(); + virtual ~AccessController() override; // XInitialization impl virtual void SAL_CALL initialize( diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 2e5095a934e9..212e506002ef 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -72,7 +72,7 @@ protected: public: explicit FilePolicy( Reference< XComponentContext > const & xComponentContext ); - virtual ~FilePolicy(); + virtual ~FilePolicy() override; // XPolicy impl virtual Sequence< Any > SAL_CALL getPermissions( diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 8aa9fed302a4..2aec83c41396 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -161,7 +161,7 @@ public: : aFactories( rFactories ) , nIt( 0 ) {} - virtual ~ServiceEnumeration_Impl() {} + virtual ~ServiceEnumeration_Impl() override {} // XEnumeration sal_Bool SAL_CALL hasMoreElements() @@ -253,7 +253,7 @@ public: : aImplementationMap( rImplementationMap ) , aIt( aImplementationMap.begin() ) {} - virtual ~ImplementationEnumeration_Impl(); + virtual ~ImplementationEnumeration_Impl() override; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() @@ -372,7 +372,7 @@ class OServiceManager { public: explicit OServiceManager( Reference< XComponentContext > const & xContext ); - virtual ~OServiceManager(); + virtual ~OServiceManager() override; // XInitialization void SAL_CALL initialize( Sequence< Any > const & args ) @@ -512,7 +512,7 @@ protected: public: explicit OServiceManagerWrapper( Reference< XComponentContext > const & xContext ); - virtual ~OServiceManagerWrapper(); + virtual ~OServiceManagerWrapper() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override @@ -1270,7 +1270,7 @@ class ORegistryServiceManager : public OServiceManager { public: explicit ORegistryServiceManager( Reference< XComponentContext > const & xContext ); - virtual ~ORegistryServiceManager(); + virtual ~ORegistryServiceManager() override; // XInitialization void SAL_CALL initialize(const Sequence< Any >& Arguments) diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index b6a98c6d95be..3dd67ce2ba81 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -58,7 +58,7 @@ class SimpleRegistry: public: SimpleRegistry() {} - virtual ~SimpleRegistry() {} + virtual ~SimpleRegistry() override {} osl::Mutex mutex_; diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 0565f15abe88..214d24a31e9b 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -251,7 +251,7 @@ class TypeConverter_Impl : public WeakImplHelper< XTypeConverter, XServiceInfo > public: TypeConverter_Impl(); - virtual ~TypeConverter_Impl(); + virtual ~TypeConverter_Impl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index cc08209ecf27..c6ff6bbffa64 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -67,7 +67,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - virtual ~Translator() {} + virtual ~Translator() override {} }; OUString Translator::getImplementationName() diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index 88310c5cd340..11f02ca50b3e 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -176,7 +176,7 @@ public: { m_base.clearFragment(); } private: - virtual ~UriReference() {} + virtual ~UriReference() override {} stoc::uriproc::UriReference m_base; }; @@ -300,7 +300,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - virtual ~Factory() {} + virtual ~Factory() override {} css::uno::Reference< css::uri::XUriReference > clone( css::uno::Reference< css::uri::XUriReference > const & uriReference) diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index cd6eef41f788..1bc7bbefcf42 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -136,7 +136,7 @@ public: throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; private: - virtual ~UrlReference() {} + virtual ~UrlReference() override {} stoc::uriproc::UriReference base_; }; @@ -178,7 +178,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - virtual ~Parser() {} + virtual ~Parser() override {} }; OUString Parser::getImplementationName() diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 8405ad7f5c92..c63093d79ce7 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -284,7 +284,7 @@ public: throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; private: - virtual ~UrlReference() {} + virtual ~UrlReference() override {} sal_Int32 findParameter(OUString const & key); @@ -401,7 +401,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - virtual ~Parser() {} + virtual ~Parser() override {} }; OUString Parser::getImplementationName() diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index c96b081b2982..5d2b25852fa4 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -69,7 +69,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - virtual ~Factory() {} + virtual ~Factory() override {} css::uno::Reference< css::uno::XComponentContext > m_context; }; |