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 /framework | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
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 'framework')
-rw-r--r-- | framework/inc/classes/fwktabwindow.hxx | 2 | ||||
-rw-r--r-- | framework/inc/recording/dispatchrecorder.hxx | 2 | ||||
-rw-r--r-- | framework/inc/recording/dispatchrecordersupplier.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/generictoolbarcontroller.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/statusbaritem.hxx | 2 | ||||
-rw-r--r-- | framework/source/fwe/classes/addonsoptions.cxx | 2 | ||||
-rw-r--r-- | framework/source/fwe/helper/undomanagerhelper.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx index dd33aa8a6811..194bc69a51c5 100644 --- a/framework/inc/classes/fwktabwindow.hxx +++ b/framework/inc/classes/fwktabwindow.hxx @@ -110,7 +110,7 @@ private: public: FwkTabWindow( Window* pParent ); - ~FwkTabWindow(); + virtual ~FwkTabWindow(); void AddEventListener( const Link& rEventListener ); void RemoveEventListener( const Link& rEventListener ); diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 1d364bc1623e..99726c42feda 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -62,7 +62,7 @@ class DispatchRecorder // public interface public: DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xSMGR ); - ~DispatchRecorder(); + virtual ~DispatchRecorder(); // XInterface, XTypeProvider, XServiceInfo DECLARE_XSERVICEINFO diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index b8a6d5444865..e85e57e122da 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -87,7 +87,7 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2< public: DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); - ~DispatchRecorderSupplier(); + virtual ~DispatchRecorderSupplier(); }; // class DispatchRecorderSupplier diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index c3d24503bf18..84c7f1a72998 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -75,7 +75,7 @@ class MenuToolbarController : public GenericToolbarController const OUString& aModuleIdentifier, const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xMenuDesc ); - ~MenuToolbarController(); + virtual ~MenuToolbarController(); // XToolbarController virtual void SAL_CALL click() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx index 2661db41fd3b..68c416382bdb 100644 --- a/framework/inc/uielement/statusbaritem.hxx +++ b/framework/inc/uielement/statusbaritem.hxx @@ -41,7 +41,7 @@ public: AddonStatusbarItemData *pItemData, sal_uInt16 nId, const rtl::OUString& aCommand ); - ~StatusbarItem(); + virtual ~StatusbarItem(); void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 2387e574e863..9008a3dc4509 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -215,7 +215,7 @@ class AddonsOptions_Impl : public ConfigItem AddonsOptions_Impl(); - ~AddonsOptions_Impl(); + virtual ~AddonsOptions_Impl(); // overloaded methods of baseclass diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 21f664589bef..0e1fe7354556 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -185,7 +185,7 @@ namespace framework } protected: - ~UndoManagerRequest() + virtual ~UndoManagerRequest() { } diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index f5fdc40b13ba..4e76152904db 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -325,7 +325,7 @@ class Toolbarmenu : public ::PopupMenu { public: Toolbarmenu(); - ~Toolbarmenu(); + virtual ~Toolbarmenu(); }; Toolbarmenu::Toolbarmenu() |