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 /desktop | |
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 'desktop')
-rw-r--r-- | desktop/inc/app.hxx | 2 | ||||
-rw-r--r-- | desktop/source/app/configinit.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/descedit.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 4 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/gui/license_dialog.cxx | 2 | ||||
-rw-r--r-- | desktop/source/migration/services/jvmfwk.cxx | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 776cbc8de771..4b171595eee2 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -71,7 +71,7 @@ class Desktop : public Application }; Desktop(); - ~Desktop(); + virtual ~Desktop(); virtual int Main( ) SAL_OVERRIDE; virtual void Init() SAL_OVERRIDE; virtual void InitFinished() SAL_OVERRIDE; diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 9ca43b843d2f..362080360f71 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -91,7 +91,7 @@ public: { } - ~Context() + virtual ~Context() { } diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx index f57d91cbc5a1..d8f2257b372a 100644 --- a/desktop/source/deployment/gui/descedit.hxx +++ b/desktop/source/deployment/gui/descedit.hxx @@ -36,7 +36,7 @@ namespace dp_gui public: DescriptionEdit( Window* pParent, const ResId& rResId ); - inline ~DescriptionEdit() {} + virtual inline ~DescriptionEdit() {} void Clear(); }; diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index e2ac5b02285d..f39148f72288 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx @@ -32,7 +32,7 @@ class AutoScrollEdit : public ExtMultiLineEdit, public SfxListener { public: AutoScrollEdit( Window* pParent, const ResId& rResId ); - ~AutoScrollEdit(); + virtual ~AutoScrollEdit(); using ExtMultiLineEdit::Notify; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 789cc19b6b59..5fbf6bf203ba 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -38,7 +38,7 @@ public: DependencyDialog( Window * parent, std::vector< OUString > const & dependencies); - ~DependencyDialog(); + virtual ~DependencyDialog(); private: DependencyDialog(DependencyDialog &); // not defined diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 3875b396de1e..4bacb567de5b 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -140,7 +140,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl public: ExtBoxWithBtns_Impl(Window* pParent); - ~ExtBoxWithBtns_Impl(); + virtual ~ExtBoxWithBtns_Impl(); void InitFromDialog(ExtMgrDialog *pParentDialog); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 442b0e199d30..fc08dc518b6b 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -102,7 +102,7 @@ class ExtensionRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::sta public: ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; } - ~ExtensionRemovedListener(); + virtual ~ExtensionRemovedListener(); // XEventListener @@ -181,7 +181,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox public: ExtensionBox_Impl(Window* pParent); ExtensionBox_Impl(Window* pParent, TheExtensionManager *pManager); - ~ExtensionBox_Impl(); + virtual ~ExtensionBox_Impl(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle &rPaintRect ) SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index a060a3f273aa..c5c3d42e4594 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -65,7 +65,7 @@ public: TheExtensionManager( Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext ); - ~TheExtensionManager(); + virtual ~TheExtensionManager(); void createDialog( const bool bCreateUpdDlg ); sal_Int16 execute(); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 1dc8e474c57e..8168d0374679 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -84,7 +84,7 @@ public: com::sun::star::deployment::XPackage > > & vExtensionList, std::vector< dp_gui::UpdateData > * updateData); - ~UpdateDialog(); + virtual ~UpdateDialog(); virtual bool Close() SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 917ca8ae8f1c..87f4cdfcbe4b 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -60,7 +60,7 @@ public: UpdateInstallDialog(Window * parent, std::vector<UpdateData> & aVecUpdateData, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xCtx); - ~UpdateInstallDialog(); + virtual ~UpdateInstallDialog(); bool Close() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 858a370a5560..9758d802c31a 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -56,7 +56,7 @@ class LicenseView : public MultiLineEdit, public SfxListener public: LicenseView( Window* pParent, WinBits nStyle ); - ~LicenseView(); + virtual ~LicenseView(); void ScrollDown( ScrollType eScroll ); diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 2ffdc531dc89..00b4678ede72 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -197,7 +197,7 @@ public: - ~JavaMigration(); + virtual ~JavaMigration(); private: OUString m_sUserDir; |