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
---
 toolkit/source/awt/stylesettings.hxx                   | 2 +-
 toolkit/source/awt/vclxtoolkit.cxx                     | 2 +-
 toolkit/source/controls/dialogcontrol.cxx              | 2 +-
 toolkit/source/controls/grid/gridcontrol.hxx           | 2 +-
 toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2 +-
 toolkit/source/controls/spinningprogress.cxx           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'toolkit/source')

diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index d58af9c616b2..1235c251b32d 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -48,7 +48,7 @@ namespace toolkit
     {
     public:
         WindowStyleSettings( ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow );
-        ~WindowStyleSettings();
+        virtual ~WindowStyleSettings();
 
         void dispose();
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 85c86b82c6bf..68bc8ffa7fe4 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -191,7 +191,7 @@ protected:
 public:
 
     VCLXToolkit();
-    ~VCLXToolkit();
+    virtual ~VCLXToolkit();
 
     // css::awt::XToolkitExperimental
     css::uno::Reference< css::awt::XDevice >      SAL_CALL createScreenCompatibleDeviceUsingBuffer( sal_Int32 Width, sal_Int32 Height, sal_Int32 ScaleNumerator, sal_Int32 ScaleDenominator, sal_Int32 XOffset, sal_Int32 YOffset, sal_Int64 AddressOfMemoryBufferForSharedArrayWrapper ) throw
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 16913f013874..6f9e9711d06e 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -156,7 +156,7 @@ protected:
 public:
     UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     UnoControlDialogModel( const UnoControlDialogModel& rModel );
-    ~UnoControlDialogModel();
+    virtual ~UnoControlDialogModel();
 
     UnoControlModel*    Clone() const SAL_OVERRIDE;
     // css::beans::XMultiPropertySet
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index c00f39b46052..0d0511252a13 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -113,7 +113,7 @@ public:
     using UnoControl::getPeer;
 
 protected:
-    ~UnoGridControl();
+    virtual ~UnoGridControl();
 
 private:
     SelectionListenerMultiplexer                m_aSelectionListeners;
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index acbe7bac3110..d6a1b066a99e 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -69,7 +69,7 @@ public:
     bool    isInitialized() const { return m_isInitialized; }
 
 protected:
-    ~SortableGridDataModel();
+    virtual ~SortableGridDataModel();
 
 public:
     // XSortableGridData
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index e96474134b0a..b394cbf0a38c 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -47,7 +47,7 @@ public:
     css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 protected:
-    ~SpinningProgressControlModel();
+    virtual ~SpinningProgressControlModel();
 };
 
     SpinningProgressControlModel::SpinningProgressControlModel( Reference< XComponentContext > const & i_factory )
-- 
cgit