From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: loplugin:override: No more need for the "MSVC dtor override" workaround The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e --- fpicker/source/office/OfficeFilePicker.hxx | 2 +- fpicker/source/office/OfficeFolderPicker.hxx | 2 +- fpicker/source/office/PlacesListBox.hxx | 4 ++-- fpicker/source/office/QueryFolderName.hxx | 2 +- fpicker/source/office/RemoteFilesDialog.cxx | 2 +- fpicker/source/office/RemoteFilesDialog.hxx | 2 +- fpicker/source/office/asyncfilepicker.hxx | 2 +- fpicker/source/office/commonpicker.hxx | 2 +- fpicker/source/office/fpinteraction.hxx | 2 +- fpicker/source/office/iodlg.cxx | 2 +- fpicker/source/office/iodlg.hxx | 2 +- fpicker/source/office/iodlgimp.hxx | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) (limited to 'fpicker/source/office') diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 5f8f331a7f3c..1c9f19da76f0 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -83,7 +83,7 @@ protected: public: SvtFilePicker(); - virtual ~SvtFilePicker(); + virtual ~SvtFilePicker() override; // disambiguate XInterface diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 155f5a31bd60..31e7dbd27089 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -50,7 +50,7 @@ private: public: SvtFolderPicker(); - virtual ~SvtFolderPicker(); + virtual ~SvtFolderPicker() override; // XFolderPicker2 functions diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 05c2637883aa..5ea96efa3ce2 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 ); - virtual ~PlacesListBox_Impl( ); + virtual ~PlacesListBox_Impl( ) override; virtual void dispose() override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; @@ -50,7 +50,7 @@ class PlacesListBox : public Control public: PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ); - virtual ~PlacesListBox( ); + virtual ~PlacesListBox( ) override; virtual void dispose() override; void AppendPlace( const PlacePtr& pPlace ); diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index 11373dff5bd0..31cbc6485c56 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -38,7 +38,7 @@ private: public: QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle, const OUString& rDefaultText); - virtual ~QueryFolderNameDialog(); + virtual ~QueryFolderNameDialog() override; virtual void dispose() override; OUString GetName() const { return m_pNameEdit->GetText(); } }; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 59f77918f6b0..cc74021ade8f 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -38,7 +38,7 @@ class FileViewContainer : public vcl::Window { } - virtual ~FileViewContainer() + virtual ~FileViewContainer() override { disposeOnce(); } diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 8291eb9ce193..672e2fa3ff33 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -71,7 +71,7 @@ class RemoteFilesDialog : public SvtFileDialog_Base { public: RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits ); - virtual ~RemoteFilesDialog(); + virtual ~RemoteFilesDialog() override; virtual void dispose() override; virtual void Resize() override; diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index 864c330c044f..51089d35b349 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -80,7 +80,7 @@ namespace svt void cancel(); protected: - virtual ~AsyncPickerAction(); + virtual ~AsyncPickerAction() override; private: DECL_LINK_TYPED( OnActionDone, void*, void ); diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 9e0c4a484105..5039254d7515 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -86,7 +86,7 @@ namespace svt OCommonPicker(); protected: - virtual ~OCommonPicker(); + virtual ~OCommonPicker() override; // overridables diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index 2524082cf14e..26d82bc61151 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -72,7 +72,7 @@ namespace svt virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override; private: - virtual ~OFilePickerInteractionHandler(); + virtual ~OFilePickerInteractionHandler() override; }; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index eb15bfa19d54..6a8b5a26a8b4 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -348,7 +348,7 @@ public: , m_nCurrentFocus(FocusState::Prev) { } - virtual ~CustomContainer() { disposeOnce(); } + virtual ~CustomContainer() override { disposeOnce(); } virtual void dispose() override { _pFileView.clear(); diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 016319a9e656..a097aeaf1c88 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -160,7 +160,7 @@ protected: public: SvtFileDialog( vcl::Window* _pParent, PickerFlags nBits ); - virtual ~SvtFileDialog(); + virtual ~SvtFileDialog() override; virtual void dispose() override; virtual short Execute() override; diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 7ad944300e56..7781a2e73f52 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -80,7 +80,7 @@ enum SvtFileDlgType class SvtFileDialogURLSelector : public MenuButton { public: - virtual ~SvtFileDialogURLSelector(); + virtual ~SvtFileDialogURLSelector() override; virtual void dispose() override; private: VclPtr m_pDlg; @@ -103,7 +103,7 @@ private: public: SvtUpButton_Impl( vcl::Window* pParent, SvtFileDialog* pDlg, WinBits nBits ); - virtual ~SvtUpButton_Impl(); + virtual ~SvtUpButton_Impl() override; protected: virtual void FillURLMenu( PopupMenu* _pMenu ) override; -- cgit