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 /chart2 | |
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 'chart2')
5 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index ed4a2c913dbb..0faabc29e93f 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -31,7 +31,7 @@ class NumberFormatDialog : public SfxSingleTabDialog { public: NumberFormatDialog(Window* pParent, SfxItemSet& rSet); - ~NumberFormatDialog(); + virtual ~NumberFormatDialog(); static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ); }; diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 7716ac97fee4..992aa2d4956e 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -40,7 +40,7 @@ public: ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - ~ChartTypeDialog(); + virtual ~ChartTypeDialog(); private: ChartTypeTabPage* m_pChartTypeTabPage; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 90193f884bf2..7ffa768f5ee4 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -43,7 +43,7 @@ public: View3DDialog( Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, const XColorListRef &pColorTable ); - ~View3DDialog(); + virtual ~View3DDialog(); // from Dialog (base of TabDialog) virtual short Execute() SAL_OVERRIDE; diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index fafa9c36833b..7b14b425a972 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -31,7 +31,7 @@ public: sal_Int32 nNumberOfLines, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); - ~ColumnLineDataInterpreter(); + virtual ~ColumnLineDataInterpreter(); protected: // ____ XDataInterpreter ____ diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index d480bae65f6a..3ea60b43a598 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -390,7 +390,7 @@ class DummyChart : public DummyXShapes { public: DummyChart(com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xDrawPage); - ~DummyChart(); + virtual ~DummyChart(); virtual DummyChart* getRootShape() SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; |