From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: 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 --- ucb/source/ucp/ext/ucpext_content.hxx | 16 ++++++++-------- ucb/source/ucp/ext/ucpext_datasupplier.hxx | 22 +++++++++++----------- ucb/source/ucp/ext/ucpext_provider.hxx | 6 +++--- ucb/source/ucp/ext/ucpext_resultset.hxx | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'ucb/source/ucp/ext') diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index 50f55307c6d6..57fdd5cbb843 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -77,7 +77,7 @@ namespace ucb { namespace ucp { namespace ext static OUString decodeIdentifier( const OUString& i_rIdentifier ); - virtual OUString getParentURL(); + virtual OUString getParentURL() SAL_OVERRIDE; ExtensionContentType getExtensionContentType() const { return m_eExtContentType; } @@ -90,11 +90,11 @@ namespace ucb { namespace ucp { namespace ext virtual ~Content(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) 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) SAL_OVERRIDE; // XContent - virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -106,18 +106,18 @@ namespace ucb { namespace ucp { namespace ext throw ( ::com::sun::star::uno::Exception , ::com::sun::star::ucb::CommandAbortedException , ::com::sun::star::uno::RuntimeException, std::exception - ); + ) SAL_OVERRIDE; virtual void SAL_CALL abort( sal_Int32 CommandId ) throw ( ::com::sun::star::uno::RuntimeException, std::exception - ); + ) SAL_OVERRIDE; private: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > getProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::CommandInfo > getCommands( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > getProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::CommandInfo > getCommands( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > setPropertyValues( diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index 48ba72cc4651..8a7c54f373fa 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -51,22 +51,22 @@ namespace ucb { namespace ucp { namespace ext protected: virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual bool getResult( sal_uInt32 nIndex ); + virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual sal_uInt32 totalCount(); - virtual sal_uInt32 currentCount(); - virtual bool isCountFinal(); + virtual sal_uInt32 totalCount() SAL_OVERRIDE; + virtual sal_uInt32 currentCount() SAL_OVERRIDE; + virtual bool isCountFinal() SAL_OVERRIDE; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ); - virtual void releasePropertyValues( sal_uInt32 nIndex ); + virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void close(); + virtual void close() SAL_OVERRIDE; - virtual void validate() throw( com::sun::star::ucb::ResultSetException ); + virtual void validate() throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; private: ::boost::scoped_ptr< DataSupplier_Impl > m_pImpl; diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 98a397a26aa6..9e339f29891c 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -38,8 +38,8 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) 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) SAL_OVERRIDE; // XServiceInfo - static versions static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); @@ -47,7 +47,7 @@ namespace ucb { namespace ucp { namespace ext static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // XContentProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: static OUString getRootURL(); diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx index 51e5a21fb5e7..2b1521183224 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.hxx +++ b/ucb/source/ucp/ext/ucpext_resultset.hxx @@ -48,8 +48,8 @@ namespace ucb { namespace ucp { namespace ext ::rtl::Reference< Content > m_xContent; private: - virtual void initStatic(); - virtual void initDynamic(); + virtual void initStatic() SAL_OVERRIDE; + virtual void initDynamic() SAL_OVERRIDE; }; -- cgit