summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /uui
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'uui')
-rw-r--r--uui/source/authfallbackdlg.hxx2
-rw-r--r--uui/source/fltdlg.cxx2
-rw-r--r--uui/source/fltdlg.hxx4
-rw-r--r--uui/source/interactionhandler.cxx12
-rw-r--r--uui/source/logindlg.hxx2
-rw-r--r--uui/source/masterpasscrtdlg.hxx2
-rw-r--r--uui/source/masterpassworddlg.hxx2
-rw-r--r--uui/source/nameclashdlg.hxx2
-rw-r--r--uui/source/passwordcontainer.hxx10
-rw-r--r--uui/source/passworddlg.hxx2
-rw-r--r--uui/source/requeststringresolver.hxx8
-rw-r--r--uui/source/secmacrowarnings.hxx2
-rw-r--r--uui/source/sslwarndlg.hxx2
-rw-r--r--uui/source/unknownauthdlg.hxx2
14 files changed, 27 insertions, 27 deletions
diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx
index 6442f74c0237..b90bb15d7b13 100644
--- a/uui/source/authfallbackdlg.hxx
+++ b/uui/source/authfallbackdlg.hxx
@@ -29,7 +29,7 @@ public:
AuthFallbackDlg(Window* pParent, const OUString& instructions,
const OUString& url);
virtual ~AuthFallbackDlg();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
OUString GetCode() const { return m_pEDCode->GetText(); }
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index d91e97dfae54..08d4497af919 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -173,7 +173,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::
{
}
- sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+ sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
{
return (sal_Int32)(m_pDevice->GetTextWidth(sString));
}
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index df0b8eeafbf8..a93b4a93ceb5 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -48,14 +48,14 @@ class FilterDialog : public ModalDialog
public:
explicit FilterDialog(vcl::Window* pParentWindow);
virtual ~FilterDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetURL ( const OUString& sURL );
void ChangeFilters( const FilterNameList* pFilterNames );
bool AskForFilter ( FilterNameListPtr& pSelectedItem );
// helper (or hided functions!)
private:
- short Execute() SAL_OVERRIDE { return RET_CANCEL; };
+ short Execute() override { return RET_CANCEL; };
OUString impl_buildUIFileName( const OUString& sURL );
// member
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index 389670da2c71..dbd270168060 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -51,32 +51,32 @@ public:
virtual ~UUIInteractionHandler();
virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(OUString const &
rServiceName)
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
initialize(
com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
rArguments)
- throw (com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::Exception, std::exception) override;
virtual void SAL_CALL
handle(com::sun::star::uno::Reference<
com::sun::star::task::XInteractionRequest > const &
rRequest)
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
handleInteractionRequest(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request
- ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
};
UUIInteractionHandler::UUIInteractionHandler(
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index a8c34646bf04..34d099793826 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -70,7 +70,7 @@ public:
LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags,
const OUString& rServer, const OUString &rRealm);
virtual ~LoginDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
OUString GetName() const { return m_pNameED->GetText(); }
void SetName( const OUString& rNewName ) { m_pNameED->SetText( rNewName ); }
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index d363cb60e600..5174420cec97 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -43,7 +43,7 @@ private:
public:
MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr );
virtual ~MasterPasswordCreateDialog();
- virtual void dispose() SAL_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 c1d945eee6f6..ccc1d602def2 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -38,7 +38,7 @@ class MasterPasswordDialog : public ModalDialog
public:
MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
virtual ~MasterPasswordDialog();
- virtual void dispose() SAL_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 3e050f6953d9..c33649f5708d 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -49,7 +49,7 @@ public:
OUString const & rProposedNewName,
bool bAllowOverwrite );
virtual ~NameClashDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
OUString getNewName() const { return maNewName; }
};
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index aac2ee3f4a86..8ddd3e0ab5ed 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -148,26 +148,26 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName )
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
// XInteractionHandler2
virtual void SAL_CALL
handle( const ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionRequest >& Request )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
handleInteractionRequest( const ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionRequest >& Request )
- throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// Non-UNO interfaces
static OUString
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index d013dcac6725..ffc99a5e64e6 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -47,7 +47,7 @@ public:
PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
virtual ~PasswordDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
OUString GetPassword() const { return m_pEDPassword->GetText(); }
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 3d859091f509..f15b292ef874 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -60,21 +60,21 @@ private:
virtual ~UUIInteractionRequestStringResolver();
virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService(OUString const &
rServiceName)
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual com::sun::star::beans::Optional< OUString > SAL_CALL
getStringFromInformationalRequest(
const com::sun::star::uno::Reference<
com::sun::star::task::XInteractionRequest >& Request )
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 8a81afaad3f4..7bdb8240fe3a 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -69,7 +69,7 @@ private:
public:
MacroWarning( vcl::Window* pParent, bool _bShowSignatures, ResMgr& rResMgr );
virtual ~MacroWarning();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetDocumentURL( const OUString& rDocURL );
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 73b25c2c4c0d..006795705431 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -44,7 +44,7 @@ public:
css::uno::Reference< css::security::XCertificate > getCert() { return m_rXCert; }
- virtual void response(short nResponseId) SAL_OVERRIDE;
+ virtual void response(short nResponseId) override;
void setDescription1Text(const OUString &aText) { set_primary_text(aText); }
};
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index fa6ce667ab42..02631e7bd508 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -47,7 +47,7 @@ public:
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~UnknownAuthDialog();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
css::uno::Reference< css::security::XCertificate > getCert()
{