From 362d4f0cd4e50111edfae9d30c90602c37ed65a2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 1 Apr 2014 19:18:35 +0200
Subject: 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
---
 xmlhelp/source/cxxhelp/inc/tvfactory.hxx                | 2 +-
 xmlhelp/source/cxxhelp/inc/tvread.hxx                   | 4 ++--
 xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx        | 4 ++--
 xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx | 2 +-
 xmlhelp/source/cxxhelp/provider/resultset.hxx           | 2 +-
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index b3e7a2c30d97..261d1389c0bc 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -41,7 +41,7 @@ class TVFactory: public cppu::WeakImplHelper2 <
 
         TVFactory( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
 
-        ~TVFactory();
+        virtual ~TVFactory();
 
         // XServiceInfo
         virtual OUString SAL_CALL
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 7e5b572423d6..f5d937e90bc3 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -168,7 +168,7 @@ namespace treeview {
     public:
         TVRead( const ConfigData& configData,TVDom* tvDom = 0 );
 
-        ~TVRead();
+        virtual ~TVRead();
 
         // XNameAccess
 
@@ -214,7 +214,7 @@ namespace treeview {
 
         TVChildTarget( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
 
-        ~TVChildTarget();
+        virtual ~TVChildTarget();
 
         virtual com::sun::star::uno::Any SAL_CALL
         getByName( const OUString& aName )
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
index 7e2ecf1e9508..5b3fd18925d9 100644
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
@@ -67,7 +67,7 @@ namespace xmlsearch {
             {
             }
 
-            ~StreamDecompressor() { }
+            virtual ~StreamDecompressor() { }
 
 
             virtual sal_Int32 getNextByte() SAL_OVERRIDE;
@@ -91,7 +91,7 @@ namespace xmlsearch {
             }
 
 
-            ~ByteArrayDecompressor() { }
+            virtual ~ByteArrayDecompressor() { }
 
             sal_Int32 bytesRead()
             {
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
index b55257bb1e77..b52d3592eb76 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
@@ -42,7 +42,7 @@ namespace chelp {
         BufferedInputStream(
             const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
 
-        ~BufferedInputStream();
+        virtual ~BufferedInputStream();
 
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface( const com::sun::star::uno::Type& rType )
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
index 7a9b6ff274e1..e7b9c99019f4 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx
@@ -50,7 +50,7 @@ namespace chelp {
             com::sun::star::ucb::XCommandEnvironment >& rxEnv,
             ResultSetFactory* pFactory );
 
-        ~DynamicResultSet();
+        virtual ~DynamicResultSet();
     };
 
 }
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 7ccdebdf4b57..c2b0163a0fdc 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -329,7 +329,7 @@ public:
                             Databases*    pDatatabases,
                             bool isRoot = false );
 
-    ~InputStreamTransformer();
+    virtual ~InputStreamTransformer();
 
     virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual void SAL_CALL acquire( void ) throw() SAL_OVERRIDE;
-- 
cgit