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 /include/toolkit/awt | |
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 'include/toolkit/awt')
-rw-r--r-- | include/toolkit/awt/animatedimagespeer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxaccessiblecomponent.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxcontainer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxdevice.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxfont.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxgraphics.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxmenu.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxpointer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxprinter.hxx | 4 | ||||
-rw-r--r-- | include/toolkit/awt/vclxregion.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxspinbutton.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxsystemdependentwindow.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxtabpagecontainer.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxtopwindow.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxwindow.hxx | 2 | ||||
-rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 36 |
16 files changed, 35 insertions, 35 deletions
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index 9931be7eca66..3bd41a6f13e6 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -52,7 +52,7 @@ namespace toolkit AnimatedImagesPeer(); protected: - ~AnimatedImagesPeer(); + virtual ~AnimatedImagesPeer(); public: // XAnimation diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index b4a5d42e1f45..9faf70655f11 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -80,7 +80,7 @@ protected: public: VCLXAccessibleComponent( VCLXWindow* pVCLXindow ); - ~VCLXAccessibleComponent(); + virtual ~VCLXAccessibleComponent(); VCLXWindow* GetVCLXWindow() const { return mpVCLXindow; } Window* GetWindow() const; diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index b765b9a7995c..f30b0e56d7fc 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -40,7 +40,7 @@ class TOOLKIT_DLLPUBLIC VCLXContainer : public ::com::sun::star::awt::XVclContai { public: VCLXContainer(); - ~VCLXContainer(); + virtual ~VCLXContainer(); // ::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; diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 8fb4428a447f..3de7931c3d1b 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -59,7 +59,7 @@ protected: public: VCLXDevice(); - ~VCLXDevice(); + virtual ~VCLXDevice(); void SetOutputDevice( OutputDevice* pOutDev ) { mpOutputDevice = pOutDev; } OutputDevice* GetOutputDevice() const { return mpOutputDevice; } @@ -105,7 +105,7 @@ public: class VCLXVirtualDevice : public VCLXDevice { public: - ~VCLXVirtualDevice(); + virtual ~VCLXVirtualDevice(); void SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( (OutputDevice*)pVDev ); } }; diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index 21abe13a2847..fda8de9e2de1 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -50,7 +50,7 @@ protected: public: VCLXFont(); - ~VCLXFont(); + virtual ~VCLXFont(); void Init( ::com::sun::star::awt::XDevice& rxDev, const Font& rFont ); const Font& GetFont() const { return maFont; } diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 9f8c12660e89..a9e302023c61 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -69,7 +69,7 @@ private: public: VCLXGraphics(); - ~VCLXGraphics(); + virtual ~VCLXGraphics(); void Init( OutputDevice* pOutDev ); void InitOutputDevice( sal_uInt16 nFlags ); diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 63b6d7ff7fd8..b149202d52fd 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -72,7 +72,7 @@ protected: public: VCLXMenu(); VCLXMenu( Menu* pMenu ); - ~VCLXMenu(); + virtual ~VCLXMenu(); Menu* GetMenu() const { return mpMenu; } diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 08dd4fcf3e83..fb224c6cf41b 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -47,7 +47,7 @@ protected: public: VCLXPointer(); - ~VCLXPointer(); + virtual ~VCLXPointer(); const Pointer& GetPointer() const { return maPointer; } diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index a893aefaed7e..434c47a2c2da 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -111,7 +111,7 @@ class VCLXPrinter: public VCLXPrinter_Base JobSetup maInitJobSetup; public: VCLXPrinter( const OUString& rPrinterName ); - ~VCLXPrinter(); + virtual ~VCLXPrinter(); // ::com::sun::star::beans::XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getPropertySetInfo(); } @@ -148,7 +148,7 @@ class VCLXInfoPrinter: public VCLXInfoPrinter_Base { public: VCLXInfoPrinter( const OUString& rPrinterName ); - ~VCLXInfoPrinter(); + virtual ~VCLXInfoPrinter(); // ::com::sun::star::beans::XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return VCLXPrinterPropertySet::getPropertySetInfo(); } diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 2306b41f086b..0aafb8616516 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -47,7 +47,7 @@ protected: public: VCLXRegion(); - ~VCLXRegion(); + virtual ~VCLXRegion(); void SetRegion( const Region& rRegion ) { maRegion = rRegion; } const Region& GetRegion() const { return maRegion; } diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index 2128d477bba1..ea6c862892ff 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -46,7 +46,7 @@ namespace toolkit VCLXSpinButton(); protected: - ~VCLXSpinButton( ); + virtual ~VCLXSpinButton( ); // XInterface DECLARE_XINTERFACE() diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index d930b4c003af..589aed673164 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -37,7 +37,7 @@ class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public ::com::sun::star::awt { public: VCLXSystemDependentWindow(); - ~VCLXSystemDependentWindow(); + virtual ~VCLXSystemDependentWindow(); // ::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; diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index a1e72cbf493e..f9a6951541fd 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -42,7 +42,7 @@ class VCLXTabPageContainer : public VCLXTabPageContainer_Base { public: VCLXTabPageContainer(); - ~VCLXTabPageContainer(); + virtual ~VCLXTabPageContainer(); // ::com::sun::star::awt::XView void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 08599fb0556f..772dfcb0f96a 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -91,7 +91,7 @@ protected: public: VCLXTopWindow(bool bWHWND = false); - ~VCLXTopWindow(); + virtual ~VCLXTopWindow(); // ::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; diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index b9bfceefe958..7b7329fe8f38 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -126,7 +126,7 @@ protected: public: VCLXWindow( bool bWithDefaultProps = false ); - ~VCLXWindow(); + virtual ~VCLXWindow(); virtual void SetWindow( Window* pWindow ); Window* GetWindow() const { return (Window*)GetOutputDevice(); } diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 90e2f804f583..ca77111cfa60 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -162,7 +162,7 @@ protected: public: VCLXButton(); - ~VCLXButton(); + virtual ~VCLXButton(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -198,7 +198,7 @@ class VCLXImageControl : public VCLXGraphicControl { public: VCLXImageControl(); - ~VCLXImageControl(); + virtual ~VCLXImageControl(); // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -340,7 +340,7 @@ class VCLXMessageBox : public ::com::sun::star::awt::XMessageBox, { public: VCLXMessageBox(); - ~VCLXMessageBox(); + virtual ~VCLXMessageBox(); // ::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; @@ -376,7 +376,7 @@ protected: public: VCLXFrame(); - ~VCLXFrame(); + virtual ~VCLXFrame(); // ::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; @@ -410,7 +410,7 @@ class TOOLKIT_DLLPUBLIC VCLXDialog : public ::com::sun::star::awt::XDialog2, { public: VCLXDialog(); - ~VCLXDialog(); + virtual ~VCLXDialog(); // ::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; @@ -452,7 +452,7 @@ class VCLXTabPage : public VCLXContainer { public: VCLXTabPage(); - ~VCLXTabPage(); + virtual ~VCLXTabPage(); // ::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; @@ -485,7 +485,7 @@ protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) SAL_OVERRIDE; public: VCLXMultiPage(); - ~VCLXMultiPage(); + virtual ~VCLXMultiPage(); // ::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; @@ -545,7 +545,7 @@ protected: public: VCLXFixedHyperlink(); - ~VCLXFixedHyperlink(); + virtual ~VCLXFixedHyperlink(); // ::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; @@ -593,7 +593,7 @@ protected: public: VCLXFixedText(); - ~VCLXFixedText(); + virtual ~VCLXFixedText(); // ::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; @@ -844,7 +844,7 @@ protected: public: VCLXComboBox(); - ~VCLXComboBox(); + virtual ~VCLXComboBox(); // ::com::sun::star::lang::XComponent void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -940,7 +940,7 @@ protected: public: VCLXFormattedSpinField(); - ~VCLXFormattedSpinField(); + virtual ~VCLXFormattedSpinField(); void SetFormatter( FormatterBase* pFormatter ) { mpFormatter = pFormatter; } @@ -965,7 +965,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXDateField(); - ~VCLXDateField(); + virtual ~VCLXDateField(); // ::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; @@ -1013,7 +1013,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; public: VCLXTimeField(); - ~VCLXTimeField(); + virtual ~VCLXTimeField(); // ::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; @@ -1056,7 +1056,7 @@ class VCLXNumericField : public ::com::sun::star::awt::XNumericField, { public: VCLXNumericField(); - ~VCLXNumericField(); + virtual ~VCLXNumericField(); // ::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; @@ -1106,7 +1106,7 @@ class VCLXMetricField : public ::com::sun::star::awt::XMetricField, void CallListeners(); public: VCLXMetricField(); - ~VCLXMetricField(); + virtual ~VCLXMetricField(); // ::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; @@ -1153,7 +1153,7 @@ class VCLXCurrencyField : public ::com::sun::star::awt::XCurrencyField, { public: VCLXCurrencyField(); - ~VCLXCurrencyField(); + virtual ~VCLXCurrencyField(); // ::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; @@ -1199,7 +1199,7 @@ class VCLXPatternField : public ::com::sun::star::awt::XPatternField, { public: VCLXPatternField(); - ~VCLXPatternField(); + virtual ~VCLXPatternField(); // ::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; @@ -1240,7 +1240,7 @@ protected: public: VCLXToolBox(); - ~VCLXToolBox(); + virtual ~VCLXToolBox(); }; #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX |