diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /uui | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
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
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/alreadyopen.hxx | 2 | ||||
-rw-r--r-- | uui/source/authfallbackdlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/filechanged.hxx | 2 | ||||
-rw-r--r-- | uui/source/fltdlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/interactionhandler.cxx | 2 | ||||
-rw-r--r-- | uui/source/lockfailed.hxx | 2 | ||||
-rw-r--r-- | uui/source/logindlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/masterpasscrtdlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/nameclashdlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/openlocked.hxx | 2 | ||||
-rw-r--r-- | uui/source/passwordcontainer.hxx | 2 | ||||
-rw-r--r-- | uui/source/passworddlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/requeststringresolver.hxx | 2 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.hxx | 2 | ||||
-rw-r--r-- | uui/source/trylater.hxx | 2 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.hxx | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx index 7f03ba8f5d7c..badca91b90af 100644 --- a/uui/source/alreadyopen.hxx +++ b/uui/source/alreadyopen.hxx @@ -25,7 +25,7 @@ class AlreadyOpenQueryBox : public MessBox { public: AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ); - virtual ~AlreadyOpenQueryBox(); + virtual ~AlreadyOpenQueryBox() override; }; #endif diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index 4df88ddc421b..36d1b41adcb8 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -33,7 +33,7 @@ private: public: AuthFallbackDlg(Window* pParent, const OUString& instructions, const OUString& url); - virtual ~AuthFallbackDlg(); + virtual ~AuthFallbackDlg() override; virtual void dispose() override; OUString GetCode() const; diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx index aa84c57430a8..5fe447b19c3e 100644 --- a/uui/source/filechanged.hxx +++ b/uui/source/filechanged.hxx @@ -25,7 +25,7 @@ class FileChangedQueryBox : public MessBox { public: FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ); - virtual ~FileChangedQueryBox(); + virtual ~FileChangedQueryBox() override; }; #endif diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index a93b4a93ceb5..dbedcea11a36 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -47,7 +47,7 @@ class FilterDialog : public ModalDialog // public interface public: explicit FilterDialog(vcl::Window* pParentWindow); - virtual ~FilterDialog(); + virtual ~FilterDialog() override; virtual void dispose() override; void SetURL ( const OUString& sURL ); void ChangeFilters( const FilterNameList* pFilterNames ); diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index b4384d573e38..e85bcd4215b8 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -44,7 +44,7 @@ private: public: explicit UUIInteractionHandler(css::uno::Reference< css::uno::XComponentContext > const & rxContext); - virtual ~UUIInteractionHandler(); + virtual ~UUIInteractionHandler() override; UUIInteractionHandler(const UUIInteractionHandler&) = delete; UUIInteractionHandler& operator=(const UUIInteractionHandler&) = delete; diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx index 7b7bc59503e7..09499d88a6b9 100644 --- a/uui/source/lockfailed.hxx +++ b/uui/source/lockfailed.hxx @@ -25,7 +25,7 @@ class LockFailedQueryBox : public MessBox { public: LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ); - virtual ~LockFailedQueryBox(); + virtual ~LockFailedQueryBox() override; }; #endif diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index e5e7d98b6b83..6d156a035784 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -69,7 +69,7 @@ class LoginDialog : public ModalDialog public: LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, const OUString& rServer, const OUString &rRealm); - virtual ~LoginDialog(); + virtual ~LoginDialog() override; virtual void dispose() override; OUString GetName() const { return m_pNameED->GetText(); } diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index d0a7c1484563..48310e5fd276 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -42,7 +42,7 @@ private: public: MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr ); - virtual ~MasterPasswordCreateDialog(); + virtual ~MasterPasswordCreateDialog() override; virtual void dispose() override; OUString GetMasterPassword() const { return m_pEDMasterPasswordCrt->GetText(); } diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index bff1996c1ed0..80da364af488 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -37,7 +37,7 @@ class MasterPasswordDialog : public ModalDialog public: MasterPasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); - virtual ~MasterPasswordDialog(); + virtual ~MasterPasswordDialog() override; virtual void dispose() override; OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); } diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index 0ddde55c4f32..0f98ed243bf1 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -47,7 +47,7 @@ public: OUString const & rClashingName, OUString const & rProposedNewName, bool bAllowOverwrite ); - virtual ~NameClashDialog(); + virtual ~NameClashDialog() override; virtual void dispose() override; const OUString& getNewName() const { return maNewName; } }; diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx index 72878db38951..40c50e403e00 100644 --- a/uui/source/openlocked.hxx +++ b/uui/source/openlocked.hxx @@ -25,7 +25,7 @@ class OpenLockedQueryBox : public MessBox { public: OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ); - virtual ~OpenLockedQueryBox(); + virtual ~OpenLockedQueryBox() override; }; #endif diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index 42a56e4d3b61..7457ddfe264a 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -131,7 +131,7 @@ class PasswordContainerInteractionHandler : public: explicit PasswordContainerInteractionHandler( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~PasswordContainerInteractionHandler(); + virtual ~PasswordContainerInteractionHandler() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 742174b80cb6..64ff704985fe 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -45,7 +45,7 @@ class PasswordDialog : public ModalDialog public: PasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); - virtual ~PasswordDialog(); + virtual ~PasswordDialog() override; virtual void dispose() override; void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; } diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index 77d25e816d36..4ebbee0d3ce0 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -55,7 +55,7 @@ private: explicit UUIInteractionRequestStringResolver( css::uno::Reference< css::uno::XComponentContext > const & rxContext); - virtual ~UUIInteractionRequestStringResolver(); + virtual ~UUIInteractionRequestStringResolver() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 7bdb8240fe3a..d71286d28a8d 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -68,7 +68,7 @@ private: public: MacroWarning( vcl::Window* pParent, bool _bShowSignatures, ResMgr& rResMgr ); - virtual ~MacroWarning(); + virtual ~MacroWarning() override; virtual void dispose() override; void SetDocumentURL( const OUString& rDocURL ); diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx index 18f3680a1f47..961cbe5f3a14 100644 --- a/uui/source/trylater.hxx +++ b/uui/source/trylater.hxx @@ -25,7 +25,7 @@ class TryLaterQueryBox : public MessBox { public: TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ); - virtual ~TryLaterQueryBox(); + virtual ~TryLaterQueryBox() override; }; #endif diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 090f162d6ae1..34911525b5d6 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -46,7 +46,7 @@ public: UnknownAuthDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~UnknownAuthDialog(); + virtual ~UnknownAuthDialog() override; virtual void dispose() override; const css::uno::Reference< css::security::XCertificate >& getCert() |