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 /basctl/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 'basctl/source/inc')
-rw-r--r-- | basctl/source/inc/accessibledialogwindow.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/baside3.hxx | 4 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlged.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/managelang.hxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 26ba11000e47..e905b35b52ae 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -110,7 +110,7 @@ protected: public: AccessibleDialogWindow (basctl::DialogWindow*); - ~AccessibleDialogWindow(); + virtual ~AccessibleDialogWindow(); // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index b2326a4fd9dc..50c68e7ba50e 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -80,7 +80,7 @@ public: TYPEINFO_OVERRIDE(); DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel); DialogWindow( DialogWindow* pCurView ); // never implemented - ~DialogWindow(); + virtual ~DialogWindow(); virtual void ExecuteCommand( SfxRequest& rReq ) SAL_OVERRIDE; virtual void GetState( SfxItemSet& ) SAL_OVERRIDE; @@ -126,7 +126,7 @@ class DialogWindowLayout : public Layout { public: DialogWindowLayout (Window* pParent, ObjectCatalog&); - ~DialogWindowLayout(); + virtual ~DialogWindowLayout(); public: void ShowPropertyBrowser (); void UpdatePropertyBrowser (); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index fc251d16cc18..fa5d4c65c3ac 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -153,7 +153,7 @@ public: SFX_DECL_VIEWFACTORY(Shell); Shell( SfxViewFrame *pFrame, SfxViewShell *pOldSh ); - ~Shell(); + virtual ~Shell(); BaseWindow* GetCurWindow() const { return pCurWin; } ScriptDocument const& GetCurDocument() const { return m_aCurDocument; } diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 3975cb9ebbc7..b6db056a6f67 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -142,7 +142,7 @@ public: com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel ); - ~DlgEditor(); + virtual ~DlgEditor(); Window& GetWindow() const { return rWindow; } diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 6fa0c62e9229..15332a85bb95 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -74,7 +74,7 @@ private: public: ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); - ~ManageLanguageDialog(); + virtual ~ManageLanguageDialog(); }; class SetDefaultLanguageDialog : public ModalDialog |