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

12 files changed, 20 insertions, 20 deletions

diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 3c151804847a..688f58ea575d 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -61,7 +61,7 @@ namespace toolkit
     protected:
         /// ctor. @see Init
         OAccessibleControlContext();
-        ~OAccessibleControlContext();
+        virtual ~OAccessibleControlContext();
 
         /** late ctor
         */
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index 075fcf91906f..2d76ac918dc7 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -76,7 +76,7 @@ namespace toolkit
         virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     protected:
-                                        ~AnimatedImagesControlModel();
+                                        virtual ~AnimatedImagesControlModel();
 
         ::com::sun::star::uno::Any      ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE;
         ::cppu::IPropertyArrayHelper&   SAL_CALL getInfoHelper() SAL_OVERRIDE;
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index b52eca5a3c3c..109f2293c017 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -100,7 +100,7 @@ protected:
 public:
                         ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
                         ControlModelContainerBase( const ControlModelContainerBase& rModel );
-                        ~ControlModelContainerBase();
+                        virtual ~ControlModelContainerBase();
 
     UnoControlModel*    Clone() const SAL_OVERRIDE;
 
@@ -236,7 +236,7 @@ protected:
 
 public:
     ControlContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~ControlContainerBase();
+    virtual ~ControlContainerBase();
 
     DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" )
 
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 6f86969590cf..74b01804cd47 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -49,7 +49,7 @@ private:
 public:
 
                                 UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-                                ~UnoDialogControl();
+                                virtual ~UnoDialogControl();
     OUString             GetComponentServiceName() SAL_OVERRIDE;
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -165,7 +165,7 @@ class UnoMultiPageModel : public ControlModelContainerBase
 {
 public:
     UnoMultiPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoMultiPageModel();
+    virtual ~UnoMultiPageModel();
     UnoMultiPageModel( const UnoMultiPageModel& rModel );
 
     UnoControlModel*    Clone() const SAL_OVERRIDE;
@@ -193,7 +193,7 @@ class UnoMultiPageControl :  public ControlContainerBase
     void bindPage( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
 public:
     UnoMultiPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoMultiPageControl();
+    virtual ~UnoMultiPageControl();
     OUString     GetComponentServiceName() SAL_OVERRIDE;
 
     // ::com::sun::star::lang::XServiceInfo
@@ -240,7 +240,7 @@ class UnoPageModel : public ControlModelContainerBase
 {
 public:
     UnoPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoPageModel();
+    virtual ~UnoPageModel();
     UnoPageModel( const UnoPageModel& rModel );
 
     UnoControlModel*    Clone() const SAL_OVERRIDE;
@@ -262,7 +262,7 @@ class UnoPageControl :  public ControlContainerBase
 {
 public:
     UnoPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoPageControl();
+    virtual ~UnoPageControl();
     OUString     GetComponentServiceName() SAL_OVERRIDE;
 
 
@@ -274,7 +274,7 @@ class UnoFrameModel : public ControlModelContainerBase
 {
 public:
     UnoFrameModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoFrameModel();
+    virtual ~UnoFrameModel();
     UnoFrameModel( const UnoFrameModel& rModel );
 
     UnoControlModel*    Clone() const SAL_OVERRIDE;
@@ -295,7 +295,7 @@ protected:
     virtual void        ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl ) SAL_OVERRIDE;
 public:
     UnoFrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoFrameControl();
+    virtual ~UnoFrameControl();
     OUString     GetComponentServiceName() SAL_OVERRIDE;
 
 // ::com::sun::star::lang::XServiceInfo
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index 9219c6c302f4..d8e9fde2840d 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -80,7 +80,7 @@ namespace toolkit
         DECLIMPL_SERVICEINFO_DERIVED( UnoControlFormattedFieldModel, UnoControlModel, szServiceName2_UnoControlFormattedFieldModel )
 
     protected:
-        ~UnoControlFormattedFieldModel();
+        virtual ~UnoControlFormattedFieldModel();
 
         // XComponent
         void SAL_CALL dispose(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index f5e331cc8894..5aedc632c3f9 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -108,7 +108,7 @@ namespace com { namespace sun { namespace star {
         void releaseAggregation();
 
     protected:
-        ~OGeometryControlModel_Base();
+        virtual ~OGeometryControlModel_Base();
 
         // XAggregation
         ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index 6745ef93fcd0..be86f995ae55 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -50,7 +50,7 @@ protected:
 
 public:
                             StdTabController();
-                            ~StdTabController();
+                            virtual ~StdTabController();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >  FindControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > & rxCtrlModel );
 
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index 2a31266633aa..6dab2180a6e9 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -99,7 +99,7 @@ protected:
 
 public:
                             StdTabControllerModel();
-                            ~StdTabControllerModel();
+                            virtual ~StdTabControllerModel();
 
     // ::com::sun::star::uno::XInterface
     ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OWeakAggObject::queryInterface(rType); }
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 5d7e04f4a4a9..a2ead0ec6395 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -69,7 +69,7 @@ private:
 public:
 
     UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-    ~UnoControlTabPage();
+    virtual ~UnoControlTabPage();
     OUString             GetComponentServiceName() SAL_OVERRIDE;
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index 5bd146b0d0b0..bc0649991f5c 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -137,7 +137,7 @@ protected:
 
 public:
                 UnoControl();
-                ~UnoControl();
+                virtual ~UnoControl();
 
                 UnoControlComponentInfos&           GetComponentInfos() { return maComponentInfos; }
 
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index 81c5a108f837..611b161af5fb 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -58,7 +58,7 @@ protected:
 public:
                 UnoControlContainer();
                 UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer );
-                ~UnoControlContainer();
+                virtual ~UnoControlContainer();
 
 
     // ::com::sun::star::lang::XComponent
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index d98fa10778e1..2b230c0fa0fd 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -508,7 +508,7 @@ private:
 public:
 
                             UnoCheckBoxControl();
-                            ~UnoCheckBoxControl(){;}
+                            virtual ~UnoCheckBoxControl(){;}
     OUString         GetComponentServiceName() SAL_OVERRIDE;
 
     void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -748,7 +748,7 @@ public:
                             ConstructorMode const i_mode = ConstructDefault
                         );
                         UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource );
-                        ~UnoControlListBoxModel();
+                        virtual ~UnoControlListBoxModel();
 
     UnoControlModel*    Clone() const SAL_OVERRIDE { return new UnoControlListBoxModel( *this ); }