diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /uui | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/fltdlg.cxx | 2 | ||||
-rw-r--r-- | uui/source/fltdlg.hxx | 2 | ||||
-rw-r--r-- | uui/source/interactionhandler.cxx | 12 | ||||
-rw-r--r-- | uui/source/passwordcontainer.hxx | 10 | ||||
-rw-r--r-- | uui/source/requeststringresolver.hxx | 8 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.hxx | 2 | ||||
-rw-r--r-- | uui/source/sslwarndlg.hxx | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 33c49993f9ae..5ae7ff57785b 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -181,7 +181,7 @@ class StringCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::util: { } - sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return (sal_Int32)(m_pDevice->GetTextWidth(sString)); } diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index 4df47341a813..9395b3171271 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -54,7 +54,7 @@ class FilterDialog : public ModalDialog // helper (or hided functions!) private: - short Execute() { return RET_CANCEL; }; + short Execute() SAL_OVERRIDE { return RET_CANCEL; }; OUString impl_buildUIFileName( const OUString& sURL ); // member diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index 5e979eb05206..332f15b915c2 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -51,32 +51,32 @@ public: virtual ~UUIInteractionHandler() SAL_THROW(()); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw (com::sun::star::uno::Exception, std::exception) SAL_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); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_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 ); + ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; UUIInteractionHandler::UUIInteractionHandler( diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index 9fc73bd3b6c6..e853446033b7 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -150,26 +150,26 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( com::sun::star::uno::RuntimeException, std::exception ); + throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Non-UNO interfaces static OUString diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index de94d8d5ef49..d40a5c05df57 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -61,21 +61,21 @@ private: virtual ~UUIInteractionRequestStringResolver() SAL_THROW(()); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // UUI_REQUESTSTRINGRESOLVER_HXX diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index d3b14282fa50..fd3ae8942364 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -75,7 +75,7 @@ public: MacroWarning( Window* pParent, bool _bShowSignatures, ResMgr& rResMgr ); ~MacroWarning(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void SetDocumentURL( const OUString& rDocURL ); diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index b367f9911262..c7b1492a87eb 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); + virtual void response(short nResponseId) SAL_OVERRIDE; void setDescription1Text(const OUString &aText) { set_primary_text(aText); } }; |