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
---
 io/source/TextOutputStream/TextOutputStream.cxx | 2 +-
 io/source/acceptor/acc_pipe.cxx                 | 2 +-
 io/source/acceptor/acc_socket.cxx               | 2 +-
 io/source/connector/connector.cxx               | 2 +-
 io/source/stm/odata.cxx                         | 8 ++++----
 io/source/stm/omark.cxx                         | 4 ++--
 io/source/stm/opipe.cxx                         | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'io')

diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 94e4921f6bfc..6f045a708c93 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -68,7 +68,7 @@ class OTextOutputStream : public TextOutputStreamHelper
 
 public:
     OTextOutputStream();
-    ~OTextOutputStream();
+    virtual ~OTextOutputStream();
 
     // Methods XTextOutputStream
     virtual void SAL_CALL writeString( const OUString& aString )
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 089ec627b9ab..6fa424c60f42 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -42,7 +42,7 @@ namespace io_acceptor
     {
     public:
         PipeConnection( const OUString &sConnectionDescription);
-        ~PipeConnection();
+        virtual ~PipeConnection();
 
         virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 99d738f9a137..0fc05781bf82 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -70,7 +70,7 @@ namespace io_acceptor {
     {
     public:
         SocketConnection( const OUString & sConnectionDescription );
-        ~SocketConnection();
+        virtual ~SocketConnection();
 
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 4216aba03044..9f5309824700 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -54,7 +54,7 @@ namespace stoc_connector
         Reference< XComponentContext > _xCtx;
     public:
         OConnector(const Reference< XComponentContext > &xCtx);
-        ~OConnector();
+        virtual ~OConnector();
         // Methods
         virtual Reference< XConnection > SAL_CALL connect(
             const OUString& sConnectionDescription )
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 7dd5acb23baa..7c2cc270c3ff 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -63,7 +63,7 @@ public:
         {
         }
 
-    ~ODataInputStream();
+    virtual ~ODataInputStream();
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
                                                             throw ( NotConnectedException,
@@ -513,7 +513,7 @@ public:
         : m_bValidStream( sal_False )
         {
         }
-    ~ODataOutputStream();
+    virtual ~ODataOutputStream();
 
 public: // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
@@ -933,7 +933,7 @@ public:
         {
         }
 
-    ~OObjectOutputStream();
+    virtual ~OObjectOutputStream();
 
 public:
     // XOutputStream
@@ -1200,7 +1200,7 @@ public:
         , m_bValidMarkable(sal_False)
         {
         }
-    ~OObjectInputStream();
+    virtual ~OObjectInputStream();
 
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index c6db0594baa9..ec7f5991939b 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -75,7 +75,7 @@ class OMarkableOutputStream :
 {
 public:
     OMarkableOutputStream(  );
-    ~OMarkableOutputStream();
+    virtual ~OMarkableOutputStream();
 
 public: // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
@@ -490,7 +490,7 @@ class OMarkableInputStream :
 {
 public:
     OMarkableInputStream(  );
-    ~OMarkableInputStream();
+    virtual ~OMarkableInputStream();
 
 
 public: // XInputStream
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index cdc02bfc0d55..2e1e86320725 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -57,7 +57,7 @@ class OPipeImpl :
 {
 public:
     OPipeImpl( );
-    ~OPipeImpl();
+    virtual ~OPipeImpl();
 
 public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-- 
cgit