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 /sfx2/source/inc | |
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 'sfx2/source/inc')
-rw-r--r-- | sfx2/source/inc/eventsupplier.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/partwnd.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/inc/recfloat.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/sfxpicklist.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/splitwin.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/inc/tplcitem.hxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 9962c1dcca51..62d74f213b9f 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -62,7 +62,7 @@ class SfxEvents_Impl : public ::cppu::WeakImplHelper2< css::container::XNameRepl public: SfxEvents_Impl( SfxObjectShell* pShell, css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster ); - ~SfxEvents_Impl(); + virtual ~SfxEvents_Impl(); // --- XNameReplace --- virtual void SAL_CALL replaceByName( const OUString & aName, const css::uno::Any & aElement ) diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 794c45f44699..6798d161f227 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -50,7 +50,7 @@ public: SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl); - ~SfxPartChildWnd_Impl(); + virtual ~SfxPartChildWnd_Impl(); virtual bool QueryClose() SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: Window* pParent, WinBits nBits ); - ~SfxPartDockWnd_Impl(); + virtual ~SfxPartDockWnd_Impl(); sal_Bool QueryClose(); virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > ForgetFrame(); diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index f2f865a63f91..5369b16cef57 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -31,7 +31,7 @@ public: sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); - ~SfxRecordingFloatWrapper_Impl(); + virtual ~SfxRecordingFloatWrapper_Impl(); SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl); virtual bool QueryClose() SAL_OVERRIDE; diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 77747e21375e..eb83aff068c7 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -47,7 +47,7 @@ class SfxPickList : public SfxListener ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > m_xStringLength; SfxPickList( sal_uInt32 nMenuSize ); - ~SfxPickList(); + virtual ~SfxPickList(); void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURL, sal_uInt32 nNo ); PickListEntry* GetPickListEntry( sal_uInt32 nIndex ); diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 40ed3dee6027..f3a985bee804 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -67,7 +67,7 @@ public: SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK ); - ~SfxSplitWindow(); + virtual ~SfxSplitWindow(); void ReleaseWindow_Impl(SfxDockingWindow *pWin, sal_Bool bSaveConfig=sal_True); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index f2142e8e8def..751d9bb77354 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -321,7 +321,7 @@ protected: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); - ~DropToolBox_Impl(); + virtual ~DropToolBox_Impl(); }; // class SfxTemplateDialog_Impl ------------------------------------------ @@ -367,7 +367,7 @@ public: SfxTemplateDialog_Impl( SfxBindings*, SfxTemplateDialog* pDlgWindow ); SfxTemplateDialog_Impl( SfxBindings*, SfxTemplatePanelControl* pDlgWindow ); - ~SfxTemplateDialog_Impl(); + virtual ~SfxTemplateDialog_Impl(); void Initialize (void); }; diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index 5ce731618b0b..ad0471b2c5f8 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -37,7 +37,7 @@ protected: public: SfxTemplateControllerItem( sal_uInt16 nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &); - ~SfxTemplateControllerItem(); + virtual ~SfxTemplateControllerItem(); }; |