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/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 'include/framework')
| -rw-r--r-- | include/framework/addonmenu.hxx | 4 | ||||
| -rw-r--r-- | include/framework/bmkmenu.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index d100263d0d24..8d12399e7df4 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -36,7 +36,7 @@ class FWE_DLLPUBLIC AddonMenu : public PopupMenu { public: AddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - ~AddonMenu(); + virtual ~AddonMenu(); protected: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; @@ -47,7 +47,7 @@ class AddonMenuManager; class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu { public: - ~AddonPopupMenu(); + virtual ~AddonPopupMenu(); // Check if command URL string has the unique prefix to identify addon popup menus static bool IsCommandURLPrefix( const OUString& aCmdURL ); diff --git a/include/framework/bmkmenu.hxx b/include/framework/bmkmenu.hxx index a9a37e254cd9..79c8c92baab4 100644 --- a/include/framework/bmkmenu.hxx +++ b/include/framework/bmkmenu.hxx @@ -48,7 +48,7 @@ class FWE_DLLPUBLIC BmkMenu : public AddonMenu BmkMenuType nType ); - ~BmkMenu(); + virtual ~BmkMenu(); void Initialize(); // Synchrones Laden der Eintraege |