diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /ucb | |
parent | svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID (diff) | |
download | core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.tar.gz core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.zip |
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 'ucb')
-rw-r--r-- | ucb/source/sorter/sortdynres.hxx | 6 | ||||
-rw-r--r-- | ucb/source/sorter/sortresult.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrow.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/ftp/ftpcontentidentifier.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontentprovider.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdynresultset.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_storage.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index 2ce569e75f2c..b458f5c84b5f 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -76,7 +76,7 @@ public: const css::uno::Reference < css::ucb::XAnyCompareFactory > &xCompFac, const css::uno::Reference < css::uno::XComponentContext > &rxContext ); - ~SortedDynamicResultSet(); + virtual ~SortedDynamicResultSet(); // XServiceInfo @@ -141,7 +141,7 @@ class SortedDynamicResultSetListener: public cppu::WeakImplHelper1 < public: SortedDynamicResultSetListener( SortedDynamicResultSet *mOwner ); - ~SortedDynamicResultSetListener(); + virtual ~SortedDynamicResultSetListener(); // XEventListener ( base of XDynamicResultSetListener ) @@ -172,7 +172,7 @@ public: SortedDynamicResultSetFactory( const css::uno::Reference< css::uno::XComponentContext > & rxContext); - ~SortedDynamicResultSetFactory(); + virtual ~SortedDynamicResultSetFactory(); // XServiceInfo diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index 866e708c2792..61b99d799744 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -165,7 +165,7 @@ private: public: SortedResultSet( css::uno::Reference< css::sdbc::XResultSet > aResult ); - ~SortedResultSet(); + virtual ~SortedResultSet(); const SortedEntryList* GetS2OList() const { return &maS2O; } const SimpleList* GetO2SList() const { return &maO2S; } diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index dd7fd2a2a4aa..543df3c4dd5e 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 com::sun::star::uno::Sequence< com::sun::star::uno::Any >& __m_aValueMap ); - ~XRow_impl(); + virtual ~XRow_impl(); virtual sal_Bool SAL_CALL wasNull( diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 8dcbb59fea5b..80721533257f 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -297,7 +297,7 @@ class XPropertySetInfoImpl2 { public: XPropertySetInfoImpl2(); - ~XPropertySetInfoImpl2(); + virtual ~XPropertySetInfoImpl2(); // XInterface virtual Any SAL_CALL diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 312ea84de7e3..e4a0a8eeaca9 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -60,7 +60,7 @@ namespace fileaccess { public: FileProvider( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - ~FileProvider(); + virtual ~FileProvider(); // XServiceInfo virtual OUString SAL_CALL diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index be02bac3e702..e4736b8c0243 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -48,7 +48,7 @@ namespace ftp { FTPContentIdentifier(const OUString& ident); - ~FTPContentIdentifier(); + virtual ~FTPContentIdentifier(); // XInterface diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 0636406f9e24..cb4caa972af1 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -49,7 +49,7 @@ namespace ftp FTPContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - ~FTPContentProvider(); + virtual ~FTPContentProvider(); // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 89c696130da9..37e9dbf18559 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -50,7 +50,7 @@ namespace ftp { com::sun::star::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); - ~DynamicResultSet(); + virtual ~DynamicResultSet(); }; } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index f8ab7b5c68d5..f10ada71f0cf 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -47,7 +47,7 @@ namespace tdoc_ucp { const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext, const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ); - ~StorageElementFactory(); + virtual ~StorageElementFactory(); com::sun::star::uno::Reference< com::sun::star::embed::XStorage > createTemporaryStorage() diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index 665cfa29209b..33def34583d9 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -59,7 +59,7 @@ class DAVSession; class DAVSessionFactory : public salhelper::SimpleReferenceObject { public: - ~DAVSessionFactory() SAL_THROW(()); + virtual ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, |