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 --- desktop/inc/app.hxx | 2 +- desktop/inc/lib/init.hxx | 2 +- desktop/qa/desktop_app/test_desktop_app.cxx | 2 +- desktop/qa/desktop_lib/test_desktop_lib.cxx | 2 +- desktop/source/app/check_ext_deps.cxx | 2 +- desktop/source/app/cmdlineargs.cxx | 2 +- desktop/source/app/dispatchwatcher.hxx | 2 +- desktop/source/app/officeipcthread.cxx | 8 ++++---- desktop/source/app/officeipcthread.hxx | 4 ++-- desktop/source/deployment/dp_log.cxx | 2 +- desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 2 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 +- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 6 +++--- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4 ++-- desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 4 ++-- desktop/source/deployment/gui/dp_gui_service.cxx | 2 +- desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 2 +- desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 +- desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2 +- desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 4 ++-- desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 2 +- desktop/source/deployment/gui/license_dialog.cxx | 4 ++-- desktop/source/deployment/manager/dp_commandenvironments.hxx | 2 +- desktop/source/deployment/manager/dp_extensionmanager.hxx | 2 +- desktop/source/deployment/manager/dp_informationprovider.cxx | 2 +- desktop/source/deployment/manager/dp_manager.h | 4 ++-- desktop/source/deployment/manager/dp_managerfac.cxx | 2 +- desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 4 ++-- desktop/source/deployment/registry/dp_registry.cxx | 2 +- desktop/source/deployment/registry/inc/dp_backend.h | 6 +++--- desktop/source/deployment/registry/inc/dp_backenddb.hxx | 2 +- desktop/source/lib/lokinteractionhandler.hxx | 2 +- desktop/source/migration/services/basicmigration.hxx | 2 +- desktop/source/migration/services/jvmfwk.cxx | 2 +- desktop/source/migration/services/oo3extensionmigration.hxx | 4 ++-- desktop/source/migration/services/wordbookmigration.hxx | 2 +- desktop/source/offacc/acceptor.hxx | 4 ++-- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 2 +- desktop/source/splash/splash.cxx | 4 ++-- desktop/source/splash/unxsplash.hxx | 2 +- 40 files changed, 57 insertions(+), 57 deletions(-) (limited to 'desktop') diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index c90bfdb0d7d7..f7e7e9265560 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -70,7 +70,7 @@ class Desktop : public Application }; Desktop(); - virtual ~Desktop(); + virtual ~Desktop() override; virtual int Main( ) override; virtual void Init() override; virtual void InitFinished() override; diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index db281688c2f9..e202344450ff 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -32,7 +32,7 @@ namespace desktop { { public: explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument, LibreOfficeKitCallback pCallback, void* pData); - virtual ~CallbackFlushHandler(); + virtual ~CallbackFlushHandler() override; virtual void Invoke() override; static void callback(const int type, const char* payload, void* data); void queue(const int type, const char* data); diff --git a/desktop/qa/desktop_app/test_desktop_app.cxx b/desktop/qa/desktop_app/test_desktop_app.cxx index 8fc7576f8a03..fe663dc0a6bd 100644 --- a/desktop/qa/desktop_app/test_desktop_app.cxx +++ b/desktop/qa/desktop_app/test_desktop_app.cxx @@ -48,7 +48,7 @@ public: class TestSupplier : public desktop::CommandLineArgs::Supplier { public: explicit TestSupplier(const std::initializer_list& args) : m_args(args) {} - virtual ~TestSupplier() {} + virtual ~TestSupplier() override {} virtual boost::optional< OUString > getCwdUrl() override { return boost::optional< OUString >(); } virtual bool next(OUString * argument) override { CPPUNIT_ASSERT(argument != nullptr); diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index aa8286e7e437..9e5832777c83 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -50,7 +50,7 @@ public: { } - virtual ~DesktopLOKTest() + virtual ~DesktopLOKTest() override { } diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index ad5d077c6d33..f22a3e1a63d3 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -81,7 +81,7 @@ public: SilentCommandEnv( uno::Reference const & xContext, Desktop* pDesktop ); - virtual ~SilentCommandEnv(); + virtual ~SilentCommandEnv() override; // XCommandEnvironment virtual uno::Reference SAL_CALL diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 1211cafaa545..0ddc29ac92ee 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -82,7 +82,7 @@ public: } } - virtual ~ExtCommandLineSupplier() {} + virtual ~ExtCommandLineSupplier() override {} virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; } diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index cabbe9b2e7ff..79f0858ee145 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -67,7 +67,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu DispatchWatcher(); - virtual ~DispatchWatcher(); + virtual ~DispatchWatcher() override; // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 279e173963d0..aa0d0745560d 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -140,7 +140,7 @@ public: } } - virtual ~Parser() {} + virtual ~Parser() override {} virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; } @@ -375,7 +375,7 @@ public: protected: explicit IpcThread(char const * name): Thread(name), m_handler(nullptr) {} - virtual ~IpcThread() {} + virtual ~IpcThread() override {} bool process(OString const & arguments, bool * waitProcessed); @@ -391,7 +391,7 @@ private: IpcThread("PipeIPC"), pipe_(pipe) {} - virtual ~PipeIpcThread() {} + virtual ~PipeIpcThread() override {} void execute() override; @@ -452,7 +452,7 @@ private: IpcThread("DbusIPC"), connection_(std::move(connection)) {} - virtual ~DbusIpcThread() {} + virtual ~DbusIpcThread() override {} void execute() override; diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 5e8957d1c165..2826aba9c32d 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -99,7 +99,7 @@ class RequestHandler: public salhelper::SimpleReferenceObject RequestHandler(); - virtual ~RequestHandler(); + virtual ~RequestHandler() override; public: enum Status @@ -135,7 +135,7 @@ class RequestHandlerController : public ::cppu::WeakImplHelper< { public: RequestHandlerController() {} - virtual ~RequestHandlerController() {} + virtual ~RequestHandlerController() override {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index a11b0d9560e8..1e7daa70ca68 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -49,7 +49,7 @@ class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper protected: virtual void SAL_CALL disposing() override; - virtual ~ProgressLogImpl(); + virtual ~ProgressLogImpl() override; public: ProgressLogImpl( Sequence const & args, diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index f5464222acdc..aee364554899 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -37,7 +37,7 @@ class DependencyDialog: public ModalDialog { public: DependencyDialog( vcl::Window * parent, std::vector< OUString > const & dependencies); - virtual ~DependencyDialog(); + virtual ~DependencyDialog() override; virtual void dispose() override; private: diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 9dfca89c66a0..b97a70fae2e8 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -136,7 +136,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl public: explicit ExtBoxWithBtns_Impl(vcl::Window* pParent); - virtual ~ExtBoxWithBtns_Impl(); + virtual ~ExtBoxWithBtns_Impl() override; virtual void dispose() override; void InitFromDialog(ExtMgrDialog *pParentDialog); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 4012cfcafaea..703803025750 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -144,7 +144,7 @@ class ExtMgrDialog : public ModelessDialog, public: ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); - virtual ~ExtMgrDialog(); + virtual ~ExtMgrDialog() override; virtual void dispose() override; virtual bool Notify( NotifyEvent& rNEvt ) override; @@ -213,7 +213,7 @@ class UpdateRequiredDialog : public ModalDialog, public: UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager ); - virtual ~UpdateRequiredDialog(); + virtual ~UpdateRequiredDialog() override; virtual void dispose() override; virtual short Execute() override; @@ -240,7 +240,7 @@ class ShowLicenseDialog : public ModalDialog VclPtr m_pLicenseText; public: ShowLicenseDialog(vcl::Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage); - virtual ~ShowLicenseDialog(); + virtual ~ShowLicenseDialog() override; virtual void dispose() override; }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index c1b083c3ceb5..7105f899f384 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -131,7 +131,7 @@ class ProgressCmdEnv void update_( uno::Any const & Status ) throw ( uno::RuntimeException ); public: - virtual ~ProgressCmdEnv(); + virtual ~ProgressCmdEnv() override; /** When param bAskWhenInstalling = true, then the user is asked if he agrees to install this extension. In case this extension is already installed @@ -230,7 +230,7 @@ public: bool isBusy(); private: - virtual ~Thread(); + virtual ~Thread() override; virtual void execute() override; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 3cee982becdf..6c70e41d8623 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -97,7 +97,7 @@ class ExtensionRemovedListener : public ::cppu::WeakImplHelper &xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext ); - virtual ~TheExtensionManager(); + virtual ~TheExtensionManager() override; void createDialog( const bool bCreateUpdDlg ); sal_Int16 execute(); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 53548167ca85..edac3f0cb38e 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -202,7 +202,7 @@ public: void stop(); private: - virtual ~Thread(); + virtual ~Thread() override; virtual void execute() override; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index ce0c6394ecc4..910d662a32ef 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -84,7 +84,7 @@ public: css::deployment::XPackage > > & vExtensionList, std::vector< dp_gui::UpdateData > * updateData); - virtual ~UpdateDialog(); + virtual ~UpdateDialog() override; virtual void dispose() override; virtual bool Close() override; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index f8c5ea11215d..79d55a2f6109 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -87,7 +87,7 @@ public: void stop(); private: - virtual ~Thread(); + virtual ~Thread() override; virtual void execute() override; void downloadExtensions(); @@ -121,7 +121,7 @@ class UpdateCommandEnv cssu::Reference< cssu::XComponentContext > m_xContext; public: - virtual ~UpdateCommandEnv(); + virtual ~UpdateCommandEnv() override; UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx, ::rtl::Referenceconst & thread); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 040a9f790863..bd30805ddffa 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -59,7 +59,7 @@ public: UpdateInstallDialog(vcl::Window * parent, std::vector & aVecUpdateData, css::uno::Reference< css::uno::XComponentContext > const & xCtx); - virtual ~UpdateInstallDialog(); + virtual ~UpdateInstallDialog() override; virtual void dispose() override; bool Close() override; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 212acccf4527..6d4de1fe7805 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -55,7 +55,7 @@ class LicenseView : public MultiLineEdit, public SfxListener public: LicenseView( vcl::Window* pParent, WinBits nStyle ); - virtual ~LicenseView(); + virtual ~LicenseView() override; virtual void dispose() override; void ScrollDown( ScrollType eScroll ); @@ -96,7 +96,7 @@ struct LicenseDialogImpl : public ModalDialog vcl::Window * pParent, const OUString & sExtensionName, const OUString & sLicenseText); - virtual ~LicenseDialogImpl() { disposeOnce(); } + virtual ~LicenseDialogImpl() override { disposeOnce(); } virtual void dispose() override; virtual void Activate() override; diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index fcc44ce5858d..5f4ab2429dcb 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -40,7 +40,7 @@ protected: void handle_(bool approve, bool abort, css::uno::Reference< css::task::XInteractionRequest> const & xRequest ); public: - virtual ~BaseCommandEnv(); + virtual ~BaseCommandEnv() override; BaseCommandEnv(); explicit BaseCommandEnv( css::uno::Reference< css::task::XInteractionHandler> const & handler); diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 1d9e3be32f62..c565a2f8a288 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -45,7 +45,7 @@ class ExtensionManager : private ::dp_misc::MutexHolder, { public: explicit ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext); - virtual ~ExtensionManager(); + virtual ~ExtensionManager() override; void check(); void fireModified(); diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index b56993456c6a..ca82cf215b6f 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -63,7 +63,7 @@ class PackageInformationProvider : { public: explicit PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext); - virtual ~PackageInformationProvider(); + virtual ~PackageInformationProvider() override; // XPackageInformationProvider virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index ab49b7ee17d6..841eb0b9d90f 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -97,7 +97,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper m_xUserInteractionHandler; public: - virtual ~CmdEnvWrapperImpl(); + virtual ~CmdEnvWrapperImpl() override; CmdEnvWrapperImpl( css::uno::Reference const & xUserCmdEnv, @@ -121,7 +121,7 @@ protected: inline void check(); virtual void SAL_CALL disposing() override; - virtual ~PackageManagerImpl(); + virtual ~PackageManagerImpl() override; inline PackageManagerImpl( css::uno::Reference const & xComponentContext, OUString const & context ) diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 97bba6c5901c..cf8be3c18efc 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -55,7 +55,7 @@ protected: virtual void SAL_CALL disposing() override; public: - virtual ~PackageManagerFactoryImpl(); + virtual ~PackageManagerFactoryImpl() override; explicit PackageManagerFactoryImpl( Reference const & xComponentContext ); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index bfb2fd68e7da..8fc9ed308fb8 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -62,7 +62,7 @@ class EmptyNodeList: public: EmptyNodeList(); - virtual ~EmptyNodeList(); + virtual ~EmptyNodeList() override; EmptyNodeList(const EmptyNodeList&) = delete; const EmptyNodeList& operator=(const EmptyNodeList&) = delete; @@ -146,7 +146,7 @@ class FileDoesNotExistFilter css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnv; public: - virtual ~FileDoesNotExistFilter(); + virtual ~FileDoesNotExistFilter() override; explicit FileDoesNotExistFilter( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 02419477b926..d1b77a020af9 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -94,7 +94,7 @@ protected: inline void check(); virtual void SAL_CALL disposing() override; - virtual ~PackageRegistryImpl(); + virtual ~PackageRegistryImpl() override; PackageRegistryImpl() : t_helper( getMutex() ) {} diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index cb7b8fcbe026..d94d30f1b25c 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -89,7 +89,7 @@ protected: css::uno::Reference const & xCmdEnv ) = 0; - virtual ~Package(); + virtual ~Package() override; Package( ::rtl::Reference const & myBackend, OUString const & url, OUString const & name, @@ -109,7 +109,7 @@ public: const OUString m_shortDescr; const sal_uInt16 m_smallIcon; public: - virtual ~TypeInfo(); + virtual ~TypeInfo() override; TypeInfo( OUString const & mediaType, OUString const & fileFilter, OUString const & shortDescr, @@ -308,7 +308,7 @@ protected: void check(); virtual void SAL_CALL disposing() override; - virtual ~PackageRegistryBackend(); + virtual ~PackageRegistryBackend() override; PackageRegistryBackend( css::uno::Sequence const & args, css::uno::Reference const & xContext ); diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 8731cdc3d51e..85b4ee684bcc 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -155,7 +155,7 @@ class RegisteredDb: public BackendDb public: RegisteredDb( css::uno::Reference const & xContext, OUString const & url); - virtual ~RegisteredDb() {}; + virtual ~RegisteredDb() override {}; void addEntry(OUString const & url); diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index 942ee92b038e..d6716eb51b2d 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -86,7 +86,7 @@ public: desktop::LibLibreOffice_Impl *, desktop::LibLODocument_Impl *pLOKDocumt = nullptr); - virtual ~LOKInteractionHandler(); + virtual ~LOKInteractionHandler() override; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) override; diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index 784d7f972da1..53791d64ba4b 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -63,7 +63,7 @@ namespace migration public: BasicMigration(); - virtual ~BasicMigration(); + virtual ~BasicMigration() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 02d26b3a303d..aa3e15deb494 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -190,7 +190,7 @@ public: css::lang::WrappedTargetException, std::exception ) override; - virtual ~JavaMigration(); + virtual ~JavaMigration() override; private: OUString m_sUserDir; diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index b2c14bf11bc4..482dfe844909 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -87,7 +87,7 @@ namespace migration public: explicit OO3ExtensionMigration(css::uno::Reference< css::uno::XComponentContext > const & ctx); - virtual ~OO3ExtensionMigration(); + virtual ~OO3ExtensionMigration() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -114,7 +114,7 @@ namespace migration css::ucb::XProgressHandler > { public: - virtual ~TmpRepositoryCommandEnv(); + virtual ~TmpRepositoryCommandEnv() override; TmpRepositoryCommandEnv(); // XCommandEnvironment diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index d9266f693ba1..86013ce36d89 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -63,7 +63,7 @@ namespace migration public: WordbookMigration(); - virtual ~WordbookMigration(); + virtual ~WordbookMigration() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index 42ae671bc4f6..0dc1889d0adb 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -71,7 +71,7 @@ private: public: explicit Acceptor( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~Acceptor(); + virtual ~Acceptor() override; void run(); @@ -101,7 +101,7 @@ private: public: AccInstanceProvider(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::connection::XConnection >& rConnection); - virtual ~AccInstanceProvider(); + virtual ~AccInstanceProvider() override; // XInstanceProvider virtual css::uno::Reference SAL_CALL getInstance (const OUString& aName ) diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 86ae42221ed8..afd58d754a77 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -68,7 +68,7 @@ class CommandEnvironmentImpl bool & accept, bool & decline); public: - virtual ~CommandEnvironmentImpl(); + virtual ~CommandEnvironmentImpl() override; CommandEnvironmentImpl( Reference const & xComponentContext, OUString const & log_file, diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index aa33a5c16fca..c86db11363d4 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -55,7 +55,7 @@ public: SplashScreen *pSpl; ScopedVclPtr _vdev; explicit SplashScreenWindow(SplashScreen *); - virtual ~SplashScreenWindow() { disposeOnce(); } + virtual ~SplashScreenWindow() override { disposeOnce(); } virtual void dispose() override; // workwindow virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; @@ -73,7 +73,7 @@ private: VclPtr pWindow; DECL_LINK_TYPED( AppEventListenerHdl, VclSimpleEvent&, void ); - virtual ~SplashScreen(); + virtual ~SplashScreen() override; void loadConfig(); void updateStatus(); void SetScreenBitmap(BitmapEx &rBitmap); diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index 4935777eaf2d..e854387fa3ff 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -34,7 +34,7 @@ private: UnxSplashScreen( const UnxSplashScreen& ) = delete; UnxSplashScreen operator =( const UnxSplashScreen& ) = delete; - virtual ~UnxSplashScreen(); + virtual ~UnxSplashScreen() override; static UnxSplashScreen *m_pINSTANCE; -- cgit