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/source/corereflection | |
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/source/corereflection')
-rw-r--r-- | stoc/source/corereflection/base.hxx | 12 | ||||
-rw-r--r-- | stoc/source/corereflection/crenum.cxx | 2 | ||||
-rw-r--r-- | stoc/source/corereflection/criface.cxx | 2 |
3 files changed, 8 insertions, 8 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; |