summaryrefslogtreecommitdiff
path: root/vcl
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
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')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx2
-rw-r--r--vcl/generic/print/bitmap_gfx.cxx2
-rw-r--r--vcl/generic/print/prtsetup.hxx6
-rw-r--r--vcl/inc/brdwin.hxx4
-rw-r--r--vcl/inc/generic/geninst.h2
-rw-r--r--vcl/inc/helpwin.hxx2
-rw-r--r--vcl/inc/ilstbox.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtkdata.hxx2
-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
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx2
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx2
-rw-r--r--vcl/unx/kde/UnxCommandThread.hxx2
21 files changed, 33 insertions, 33 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 723262956340..e145c6803be8 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -1149,7 +1149,7 @@ class FontConfigFontOptions : public ImplFontOptions
{
public:
FontConfigFontOptions() : mpPattern(0) {}
- ~FontConfigFontOptions()
+ virtual ~FontConfigFontOptions()
{
FcPatternDestroy(mpPattern);
}
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index 0e6fdcda6314..e3f6f44e1e4f 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -293,7 +293,7 @@ private:
public:
LZWEncoder (osl::File* pOutputFile);
- ~LZWEncoder ();
+ virtual ~LZWEncoder ();
virtual void EncodeByte (sal_uInt8 nByte) SAL_OVERRIDE;
};
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 6a037900e7ba..b7830cf9ab8d 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -64,7 +64,7 @@ class RTSDialog : public TabDialog
void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
public:
RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, Window* pParent = NULL);
- ~RTSDialog();
+ virtual ~RTSDialog();
const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
};
@@ -87,7 +87,7 @@ class RTSPaperPage : public TabPage
DECL_LINK( SelectHdl, ListBox* );
public:
RTSPaperPage( RTSDialog* );
- ~RTSPaperPage();
+ virtual ~RTSPaperPage();
void update();
@@ -116,7 +116,7 @@ class RTSDevicePage : public TabPage
DECL_LINK( ModifyHdl, Edit* );
public:
RTSDevicePage( RTSDialog* );
- ~RTSDevicePage();
+ virtual ~RTSDevicePage();
void update();
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 1adfaee92b47..4b33db5f933f 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -122,7 +122,7 @@ public:
sal_uInt16 nTypeStyle = 0 );
ImplBorderWindow( Window* pParent, WinBits nStyle = 0,
sal_uInt16 nTypeStyle = 0 );
- ~ImplBorderWindow();
+ virtual ~ImplBorderWindow();
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -281,7 +281,7 @@ class ImplStdBorderWindowView : public ImplBorderWindowView
public:
ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow );
- ~ImplStdBorderWindowView();
+ virtual ~ImplStdBorderWindowView();
virtual bool MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual bool MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index a41089cf9e31..165b3d9bae9d 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -56,7 +56,7 @@ protected:
public:
SalYieldMutex();
- ~SalYieldMutex();
+ virtual ~SalYieldMutex();
virtual void acquire() SAL_OVERRIDE;
virtual void release() SAL_OVERRIDE;
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 1409f2659ec1..e8c1431e2542 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -53,7 +53,7 @@ protected:
public:
HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle );
- ~HelpTextWindow();
+ virtual ~HelpTextWindow();
const OUString& GetHelpText() const { return maHelpText; }
void SetHelpText( const OUString& rHelpText );
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index d0c3f709a02d..6163da02b023 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -268,7 +268,7 @@ public:
virtual void FillLayoutData() const SAL_OVERRIDE;
ImplListBoxWindow( Window* pParent, WinBits nWinStyle );
- ~ImplListBoxWindow();
+ virtual ~ImplListBoxWindow();
ImplEntryList* GetEntryList() const { return mpEntryList; }
@@ -413,7 +413,7 @@ protected:
public:
ImplListBox( Window* pParent, WinBits nWinStyle );
- ~ImplListBox();
+ virtual ~ImplListBox();
const ImplEntryList* GetEntryList() const { return maLBWindow.GetEntryList(); }
ImplListBoxWindow* GetMainWindow() { return &maLBWindow; }
@@ -571,7 +571,7 @@ protected:
public:
ImplWin( Window* pParent, WinBits nWinStyle = 0 );
- ~ImplWin() {};
+ virtual ~ImplWin() {};
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
@@ -617,7 +617,7 @@ private:
public:
ImplBtn( Window* pParent, WinBits nWinStyle = 0 );
- ~ImplBtn() {};
+ virtual ~ImplBtn() {};
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 36196de95439..b8396c4c11be 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -86,7 +86,7 @@ class GtkSalTimer : public SalTimer
struct SalGtkTimeoutSource *m_pTimeout;
public:
GtkSalTimer();
- ~GtkSalTimer();
+ virtual ~GtkSalTimer();
virtual void Start( sal_uLong nMS ) SAL_OVERRIDE;
virtual void Stop() SAL_OVERRIDE;
bool Expired();
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 );
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index d26852410867..4f0aa4e429c7 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -378,7 +378,7 @@ namespace x11 {
bool m_bShutDown;
SelectionManager();
- ~SelectionManager();
+ virtual ~SelectionManager();
SelectionAdaptor* getAdaptor( Atom selection );
PixmapHolder* getPixmapHolder( Atom selection );
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 868da22aaa80..a38627f7216f 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -68,7 +68,7 @@ namespace psp
public:
SystemQueueInfo();
- ~SystemQueueInfo();
+ virtual ~SystemQueueInfo();
bool hasChanged() const;
OUString getCommand() const;
diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx
index 7f963c4a8d22..413d52a97e96 100644
--- a/vcl/unx/kde/UnxCommandThread.hxx
+++ b/vcl/unx/kde/UnxCommandThread.hxx
@@ -97,7 +97,7 @@ protected:
public:
UnxFilePickerCommandThread( UnxFilePickerNotifyThread *pNotifyThread, int nReadFD );
- ~UnxFilePickerCommandThread();
+ virtual ~UnxFilePickerCommandThread();
YieldingCondition& SAL_CALL execCondition() { return m_aExecCondition; }
bool SAL_CALL result();