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 /ucb/source/ucp/file | |
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 'ucb/source/ucp/file')
-rw-r--r-- | ucb/source/ucp/file/bc.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filcmd.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filid.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinpstr.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filprp.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrow.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrset.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.hxx | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 506bf59ec45c..d8b47dee6a52 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -84,7 +84,7 @@ namespace fileaccess { const css::uno::Reference< css::ucb::XContentIdentifier >& xContentIdentifier, const OUString& aUnqPath ); - virtual ~BaseContent(); + virtual ~BaseContent() override; // XInterface virtual css::uno::Any SAL_CALL diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index e811c8f758c2..154f3dc1c898 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -41,7 +41,7 @@ namespace fileaccess { explicit XCommandInfo_impl( shell* pMyShell ); - virtual ~XCommandInfo_impl(); + virtual ~XCommandInfo_impl() override; // XInterface virtual css::uno::Any SAL_CALL diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index c3f38da8a30d..d2c2baf51e51 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -39,7 +39,7 @@ namespace fileaccess { FileContentIdentifier( const OUString& aUnqPath, bool IsNormalized = true ); - virtual ~FileContentIdentifier(); + virtual ~FileContentIdentifier() override; // XInterface virtual css::uno::Any SAL_CALL diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index c43934471cc9..25aa6dd6579e 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -44,7 +44,7 @@ namespace fileaccess { XInputStream_impl( const OUString& aUncPath, bool bLock ); - virtual ~XInputStream_impl(); + virtual ~XInputStream_impl() override; /** * Returns an error code as given by filerror.hxx diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index 1e09c7f3ae08..dfba38f9c1e1 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -35,7 +35,7 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ); XPropertySetInfo_impl( shell* pMyShell,const css::uno::Sequence< css::beans::Property >& seq ); - virtual ~XPropertySetInfo_impl(); + virtual ~XPropertySetInfo_impl() override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties() diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 8d947b195095..8449543d53c2 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -33,7 +33,7 @@ namespace fileaccess { { public: XRow_impl( shell* pShell,const css::uno::Sequence< css::uno::Any >& aValueMap ); - virtual ~XRow_impl(); + virtual ~XRow_impl() override; virtual sal_Bool SAL_CALL wasNull() diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 5ebf86dc9fc3..19a169a90d1f 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -59,7 +59,7 @@ class XResultSet_impl : public Notifier, const css::uno::Sequence< css::beans::Property >& seq, const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort ); - virtual ~XResultSet_impl(); + virtual ~XResultSet_impl() override; virtual ContentEventNotifier* cDEL() override { diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index 4c09bfffddb0..7a9403382877 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -58,7 +58,7 @@ class XStream_impl : public cppu::WeakImplHelper< sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;} sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;} - virtual ~XStream_impl(); + virtual ~XStream_impl() override; // XStream diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 98c98fd2df37..b67304e52739 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -258,7 +258,7 @@ class XPropertySetInfoImpl2 { public: XPropertySetInfoImpl2(); - virtual ~XPropertySetInfoImpl2(); + virtual ~XPropertySetInfoImpl2() override; // XInterface virtual Any SAL_CALL diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 19cf312812a0..df44978e62a3 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -59,7 +59,7 @@ namespace fileaccess { public: explicit FileProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~FileProvider(); + virtual ~FileProvider() override; // XServiceInfo virtual OUString SAL_CALL diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index cac588f310b8..e23a219cfd8c 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -155,7 +155,7 @@ namespace fileaccess { shell( const css::uno::Reference< css::uno::XComponentContext >& rxContext, FileProvider* pProvider, bool bWithConfig ); - virtual ~shell(); + virtual ~shell() override; /** |