summaryrefslogtreecommitdiff
path: root/fpicker
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 /fpicker
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 'fpicker')
-rw-r--r--fpicker/source/office/PlacesListBox.hxx4
-rw-r--r--fpicker/source/office/fpinteraction.hxx2
-rw-r--r--fpicker/source/office/iodlg.hxx2
-rw-r--r--fpicker/source/office/iodlgimp.hxx4
4 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index a9571c35c112..125e54a86109 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -28,7 +28,7 @@ class PlacesListBox_Impl : public SvHeaderTabListBox
public:
PlacesListBox_Impl( PlacesListBox* pParent, const OUString& rTitle );
- ~PlacesListBox_Impl( );
+ virtual ~PlacesListBox_Impl( );
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
};
@@ -49,7 +49,7 @@ class PlacesListBox : public Control
public:
PlacesListBox( SvtFileDialog* pFileDlg, const OUString& rTitle, const ResId& rResId );
- ~PlacesListBox( );
+ virtual ~PlacesListBox( );
void AppendPlace( PlacePtr pPlace );
void RemovePlace( sal_uInt16 nPos );
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 66aa054b0da8..8d0b9f43e372 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -73,7 +73,7 @@ namespace svt
virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- ~OFilePickerInteractionHandler();
+ virtual ~OFilePickerInteractionHandler();
};
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index d948a9e8a394..e859309c0091 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -200,7 +200,7 @@ protected:
public:
SvtFileDialog( Window* _pParent, WinBits nBits, WinBits nExtraBits );
SvtFileDialog( Window* _pParent, WinBits nBits );
- ~SvtFileDialog();
+ virtual ~SvtFileDialog();
virtual long OK();
virtual short Execute() SAL_OVERRIDE;
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index ddd8a300deec..7a7f871d4b0b 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -91,7 +91,7 @@ protected:
protected:
SvtFileDialogURLSelector( SvtFileDialog* _pParent, const ResId& _rResId, sal_uInt16 _nButtonId );
- ~SvtFileDialogURLSelector();
+ virtual ~SvtFileDialogURLSelector();
virtual void Activate() SAL_OVERRIDE;
};
@@ -103,7 +103,7 @@ private:
public:
SvtUpButton_Impl( SvtFileDialog* pParent, const ResId& rResId );
- ~SvtUpButton_Impl();
+ virtual ~SvtUpButton_Impl();
protected:
virtual void FillURLMenu( PopupMenu* _pMenu ) SAL_OVERRIDE;