summaryrefslogtreecommitdiff
path: root/vcl/source
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 /vcl/source
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 'vcl/source')
-rw-r--r--vcl/source/edit/textdat2.hxx2
-rw-r--r--vcl/source/edit/textund2.hxx8
-rw-r--r--vcl/source/edit/textundo.hxx2
-rw-r--r--vcl/source/edit/textview.cxx2
-rw-r--r--vcl/source/edit/vclmedit.cxx4
-rw-r--r--vcl/source/filter/graphicfilter.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx4
-rw-r--r--vcl/source/window/dockwin.cxx2
-rw-r--r--vcl/source/window/menu.cxx4
-rw-r--r--vcl/source/window/scrwnd.hxx2
10 files changed, 16 insertions, 16 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index ccff6a6ca52a..05375c091c42 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -273,7 +273,7 @@ private:
public:
IdleFormatter();
- ~IdleFormatter();
+ virtual ~IdleFormatter();
void DoIdleFormat( TextView* pV, sal_uInt16 nMaxRestarts );
void ForceTimeout();
diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx
index 2980641c28bf..8a5a917dd3a4 100644
--- a/vcl/source/edit/textund2.hxx
+++ b/vcl/source/edit/textund2.hxx
@@ -33,7 +33,7 @@ private:
public:
TYPEINFO_OVERRIDE();
TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uLong nPara );
- ~TextUndoDelPara();
+ virtual ~TextUndoDelPara();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
@@ -51,7 +51,7 @@ private:
public:
TYPEINFO_OVERRIDE();
TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos );
- ~TextUndoConnectParas();
+ virtual ~TextUndoConnectParas();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
@@ -69,7 +69,7 @@ private:
public:
TYPEINFO_OVERRIDE();
TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos );
- ~TextUndoSplitPara();
+ virtual ~TextUndoSplitPara();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
@@ -122,7 +122,7 @@ private:
public:
TYPEINFO_OVERRIDE();
TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel );
- ~TextUndoSetAttribs();
+ virtual ~TextUndoSetAttribs();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index f5eacc78addf..ff24a0be872a 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -41,7 +41,7 @@ protected:
public:
TextUndoManager( TextEngine* pTextEngine );
- ~TextUndoManager();
+ virtual ~TextUndoManager();
using SfxUndoManager::Undo;
virtual bool Undo() SAL_OVERRIDE;
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index fd3dbfbdac2f..6c4f039397ab 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -69,7 +69,7 @@ private:
public:
TETextDataObject( const OUString& rText );
- ~TETextDataObject();
+ virtual ~TETextDataObject();
OUString& GetText() { return maText; }
SvMemoryStream& GetHTMLStream() { return maHTMLStream; }
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 6d5a91164ee8..117082c1b6fd 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -50,7 +50,7 @@ private:
public:
TextWindow( Window* pParent );
- ~TextWindow();
+ virtual ~TextWindow();
ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; }
ExtTextView* GetTextView() const { return mpExtTextView; }
@@ -104,7 +104,7 @@ protected:
public:
ImpVclMEdit( VclMultiLineEdit* pVclMultiLineEdit, WinBits nWinStyle );
- ~ImpVclMEdit();
+ virtual ~ImpVclMEdit();
void SetModified( bool bMod );
bool IsModified() const;
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index c3dbbdaf3b72..77c25e454a85 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -107,7 +107,7 @@ protected:
public:
ImpFilterOutputStream( SvStream& rStm ) : mrStm( rStm ) {}
- ~ImpFilterOutputStream() {}
+ virtual ~ImpFilterOutputStream() {}
};
#ifndef DISABLE_EXPORT
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index f3f2f42db8a4..c4f369d9e667 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -57,7 +57,7 @@ private:
public:
ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
ImplDockingWindowWrapper* pDockingWin );
- ~ImplDockFloatWin2();
+ virtual ~ImplDockFloatWin2();
virtual void Move() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
@@ -496,7 +496,7 @@ private:
public:
ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip );
- ~ImplPopupFloatWin();
+ virtual ~ImplPopupFloatWin();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index dabd203107f3..36887e816f39 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -72,7 +72,7 @@ private:
public:
ImplDockFloatWin( Window* pParent, WinBits nWinBits,
DockingWindow* pDockingWin );
- ~ImplDockFloatWin();
+ virtual ~ImplDockFloatWin();
virtual void Move() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 29500e324098..6cd7e7c218bc 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -530,7 +530,7 @@ protected:
public:
MenuFloatingWindow( Menu* pMenu, Window* pParent, WinBits nStyle );
- ~MenuFloatingWindow();
+ virtual ~MenuFloatingWindow();
void doShutdown();
@@ -737,7 +737,7 @@ private:
public:
MenuBarWindow( Window* pParent );
- ~MenuBarWindow();
+ virtual ~MenuBarWindow();
void ShowButtons( bool bClose, bool bFloat, bool bHide );
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index b7c6503f3dae..5e7fb09db42f 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -67,7 +67,7 @@ protected:
public:
ImplWheelWindow( Window* pParent );
- ~ImplWheelWindow();
+ virtual ~ImplWheelWindow();
void ImplStop();
void ImplSetWheelMode( sal_uLong nWheelMode );