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 --- unoxml/source/rdf/CBlankNode.cxx | 10 +++--- unoxml/source/rdf/CLiteral.cxx | 16 ++++----- unoxml/source/rdf/CURI.cxx | 14 ++++---- unoxml/source/rdf/librdf_repository.cxx | 64 ++++++++++++++++----------------- 4 files changed, 52 insertions(+), 52 deletions(-) (limited to 'unoxml/source/rdf') diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index defd8c5a79d8..947d9b26dba4 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -42,15 +42,15 @@ public: virtual ~CBlankNode() {} // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception); + virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: CBlankNode(const CBlankNode &); // not defined diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 1768536fff22..7f46530c1274 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -44,20 +44,20 @@ public: virtual ~CLiteral() {} // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception); + virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XLiteral: - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: CLiteral(const CLiteral &); // not defined diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index 808d8d465df8..0935b183156d 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -43,19 +43,19 @@ public: virtual ~CURI() {} // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception); + virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XNode: - virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XURI: - virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: CURI(const CURI &); // not defined diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 7af8adbcd392..c255a7825e07 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -286,15 +286,15 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( - const OUString & ServiceName) throw (uno::RuntimeException, std::exception); + const OUString & ServiceName) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (uno::RuntimeException, std::exception); + getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XRepository: virtual uno::Reference< rdf::XBlankNode > SAL_CALL createBlankNode() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Reference SAL_CALL importGraph( ::sal_Int16 i_Format, const uno::Reference< io::XInputStream > & i_xInStream, @@ -303,7 +303,7 @@ public: throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, container::ElementExistException, rdf::ParseException, - rdf::RepositoryException, io::IOException, std::exception); + rdf::RepositoryException, io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL exportGraph(::sal_Int16 i_Format, const uno::Reference< io::XOutputStream > & i_xOutStream, const uno::Reference< rdf::XURI > & i_xGraphName, @@ -311,38 +311,38 @@ public: throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, container::NoSuchElementException, rdf::RepositoryException, - io::IOException, std::exception); + io::IOException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL - getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception); + getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< rdf::XNamedGraph > SAL_CALL getGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< rdf::XNamedGraph > SAL_CALL createGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::ElementExistException, rdf::RepositoryException, std::exception); + container::ElementExistException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL destroyGraph( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException, std::exception); + container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL querySelect(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< container::XEnumeration > SAL_CALL queryConstruct(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XDocumentRepository: virtual void SAL_CALL setStatementRDFa( @@ -352,27 +352,27 @@ public: const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatementRDFa( const uno::Reference< rdf::XMetadatable > & i_xElement) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual beans::Pair< uno::Sequence, sal_Bool > SAL_CALL getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement) throw (uno::RuntimeException, lang::IllegalArgumentException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< container::XEnumeration > SAL_CALL getStatementsRDFa( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, - rdf::RepositoryException, std::exception); + rdf::RepositoryException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize( const uno::Sequence< ::com::sun::star::uno::Any > & i_rArguments) - throw (uno::RuntimeException, uno::Exception, std::exception); + throw (uno::RuntimeException, uno::Exception, std::exception) SAL_OVERRIDE; // XNamedGraph forwards --------------------------------------------- const NamedGraphMap_t::iterator clearGraph_NoLock( @@ -485,10 +485,10 @@ public: // ::com::sun::star::container::XEnumeration: virtual ::sal_Bool SAL_CALL hasMoreElements() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Any SAL_CALL nextElement() throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException, std::exception); + lang::WrappedTargetException, std::exception) SAL_OVERRIDE; private: // NB: this is not a weak pointer: streams _must_ be deleted before the @@ -598,14 +598,14 @@ public: // ::com::sun::star::container::XEnumeration: virtual ::sal_Bool SAL_CALL hasMoreElements() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Any SAL_CALL nextElement() throw (uno::RuntimeException, container::NoSuchElementException, - lang::WrappedTargetException, std::exception); + lang::WrappedTargetException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XQuerySelectResult: virtual uno::Sequence< OUString > SAL_CALL getBindingNames() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -712,38 +712,38 @@ public: // ::com::sun::star::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XURI: virtual OUString SAL_CALL getNamespace() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getLocalName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XNamedGraph: virtual uno::Reference SAL_CALL getName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clear() throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception); + container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStatement( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException, rdf::RepositoryException, std::exception); + container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception); + container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; virtual uno::Reference< container::XEnumeration > SAL_CALL getStatements( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Reference< rdf::XURI > & i_xPredicate, const uno::Reference< rdf::XNode > & i_xObject) throw (uno::RuntimeException, - container::NoSuchElementException, rdf::RepositoryException, std::exception); + container::NoSuchElementException, rdf::RepositoryException, std::exception) SAL_OVERRIDE; private: -- cgit