summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /starmath
parentb66d87086804460c1986df1b832fd6b2ea075a90 (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 'starmath')
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx2
-rw-r--r--starmath/inc/dialog.hxx4
-rw-r--r--starmath/inc/edit.hxx2
-rw-r--r--starmath/inc/symbol.hxx2
-rw-r--r--starmath/inc/toolbox.hxx2
-rw-r--r--starmath/inc/view.hxx4
6 files changed, 8 insertions, 8 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index c4ab012b3d23..752954e44a99 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -133,7 +133,7 @@ public:
SmElementsDockingWindow( SfxBindings* pBindings,
SfxChildWindow* pChildWindow,
Window* pParent );
- ~SmElementsDockingWindow();
+ virtual ~SmElementsDockingWindow();
virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE;
virtual void ToggleFloatingMode() SAL_OVERRIDE;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ae3d21499d7a..6a34c6ee3021 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -222,7 +222,7 @@ class SmDistanceDialog : public ModalDialog
public:
SmDistanceDialog(Window *pParent);
- ~SmDistanceDialog();
+ virtual ~SmDistanceDialog();
void ReadFrom(const SmFormat &rFormat);
void WriteTo (SmFormat &rFormat) /*const*/;
@@ -455,7 +455,7 @@ class SmSymDefineDialog : public ModalDialog
public:
SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
- ~SmSymDefineDialog();
+ virtual ~SmSymDefineDialog();
using OutputDevice::SetFont;
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index e2c14d63ad37..8f7a665bc036 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -89,7 +89,7 @@ class SmEditWindow : public Window, public DropTargetHelper
public:
SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin );
- ~SmEditWindow();
+ virtual ~SmEditWindow();
SmDocShell * GetDoc();
SmViewShell * GetView();
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index fa37df046b2b..eb17b368dbfd 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -130,7 +130,7 @@ private:
public:
SmSymbolManager();
SmSymbolManager(const SmSymbolManager& rSymbolSetManager);
- ~SmSymbolManager();
+ virtual ~SmSymbolManager();
SmSymbolManager & operator = (const SmSymbolManager& rSymbolSetManager);
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 5dc062a2559a..6e4f03753666 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -54,7 +54,7 @@ public:
SmToolBoxWindow(SfxBindings *pBindings,
SfxChildWindow *pChildWindow,
Window *pParent);
- ~SmToolBoxWindow();
+ virtual ~SmToolBoxWindow();
// Window
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 63c9d85818be..1f35a4b286d6 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -89,7 +89,7 @@ private:
void CaretBlinkStop();
public:
SmGraphicWindow(SmViewShell* pShell);
- ~SmGraphicWindow();
+ virtual ~SmGraphicWindow();
// Window
virtual void MouseButtonDown(const MouseEvent &rMEvt) SAL_OVERRIDE;
@@ -278,7 +278,7 @@ public:
TYPEINFO_OVERRIDE();
SmViewShell(SfxViewFrame *pFrame, SfxViewShell *pOldSh);
- ~SmViewShell();
+ virtual ~SmViewShell();
SmDocShell * GetDoc()
{