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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/dlgedfunc.hxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index aa1814174aa0..c8922a703f12 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -243,7 +243,7 @@ class OStyle : public ::comphelper::OMutexAndBroadcastHelper protected: void getPropertyDefaultByHandle( sal_Int32 _nHandle, uno::Any& _rDefault ) const SAL_OVERRIDE; - ~OStyle(){} + virtual ~OStyle(){} public: OStyle(); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 6861fb5d9593..c897cd6f5e5a 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -123,7 +123,7 @@ class NavigatorTree : public ::cppu::BaseMutex NavigatorTree* m_pTree; public: UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent); - ~UserData(); + virtual ~UserData(); inline uno::Reference< uno::XInterface > getContent() const { return m_xContent; } inline void setContent(const uno::Reference< uno::XInterface >& _xContent) { m_xContent = _xContent; } diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 1b67c2581d27..a975f0a21850 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -124,7 +124,7 @@ class DlgEdFuncInsert : public DlgEdFunc { public: DlgEdFuncInsert( OReportSection* pParent ); - ~DlgEdFuncInsert(); + virtual ~DlgEdFuncInsert(); virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -139,7 +139,7 @@ class DlgEdFuncSelect : public DlgEdFunc { public: DlgEdFuncSelect( OReportSection* pParent ); - ~DlgEdFuncSelect(); + virtual ~DlgEdFuncSelect(); virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; |