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 /sax | |
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 'sax')
-rw-r--r-- | sax/qa/cppunit/parser.cxx | 4 | ||||
-rw-r--r-- | sax/qa/cppunit/test_converter.cxx | 4 | ||||
-rw-r--r-- | sax/source/expatwrap/attrlistimpl.hxx | 14 | ||||
-rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 34 | ||||
-rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 36 | ||||
-rw-r--r-- | sax/source/fastparser/fastparser.cxx | 10 | ||||
-rw-r--r-- | sax/source/tools/fastserializer.hxx | 10 |
7 files changed, 56 insertions, 56 deletions
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index 74ab76a8ac5d..293ba5f63b1d 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -29,8 +29,8 @@ class ParserTest: public test::BootstrapFixture uno::Reference< XFastDocumentHandler > mxDocumentHandler; public: - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; void parse(); diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index 4a0008b6f923..3fad00b5bc5f 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -48,8 +48,8 @@ class ConverterTest : public ::CppUnit::TestFixture { public: - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; void testDuration(); void testDateTime(); diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index 7661684022ad..ed1cded88dce 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -48,21 +48,21 @@ public: public: // XAttributeList virtual sal_Int16 SAL_CALL getLength(void) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName(const OUString& aName) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByName(const OUString& aName) - throw( ::com::sun::star::uno::RuntimeException, std::exception); + throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable virtual ::com::sun::star::uno::Reference< XCloneable > SAL_CALL - createClone() throw(::com::sun::star::uno::RuntimeException, std::exception); + createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: struct AttributeList_impl *m_pImpl; diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index fb3445be4402..c649405b9b25 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -145,29 +145,29 @@ public: // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception); + throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE; // The SAX-Parser-Interface virtual void SAL_CALL parseStream( const InputSource& structSource) throw ( SAXException, IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDTDHandler(const css::uno::Reference < XDTDHandler > & xHandler) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEntityResolver(const css::uno::Reference< XEntityResolver >& xResolver) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLocale( const Locale &locale ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLocale( const Locale &locale ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw (std::exception); - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception); + OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -363,33 +363,33 @@ public: } public: //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (std::exception) + virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (std::exception) SAL_OVERRIDE { return XML_GetCurrentColumnNumber( m_pParser->getEntity().pParser ); } - virtual sal_Int32 SAL_CALL getLineNumber(void) throw (std::exception) + virtual sal_Int32 SAL_CALL getLineNumber(void) throw (std::exception) SAL_OVERRIDE { return XML_GetCurrentLineNumber( m_pParser->getEntity().pParser ); } - virtual OUString SAL_CALL getPublicId(void) throw (std::exception) + virtual OUString SAL_CALL getPublicId(void) throw (std::exception) SAL_OVERRIDE { return m_pParser->getEntity().structSource.sPublicId; } - virtual OUString SAL_CALL getSystemId(void) throw (std::exception) + virtual OUString SAL_CALL getSystemId(void) throw (std::exception) SAL_OVERRIDE { return m_pParser->getEntity().structSource.sSystemId; } // XSeekable (only for getPosition) - virtual void SAL_CALL seek( sal_Int64 ) throw(std::exception) + virtual void SAL_CALL seek( sal_Int64 ) throw(std::exception) SAL_OVERRIDE { } - virtual sal_Int64 SAL_CALL getPosition() throw(std::exception) + virtual sal_Int64 SAL_CALL getPosition() throw(std::exception) SAL_OVERRIDE { return XML_GetCurrentByteIndex( m_pParser->getEntity().pParser ); } - virtual ::sal_Int64 SAL_CALL getLength() throw(std::exception) + virtual ::sal_Int64 SAL_CALL getLength() throw(std::exception) SAL_OVERRIDE { return 0; } diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 1bd84f93f9e7..1ff1ec7ee3b5 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -891,7 +891,7 @@ public: public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) - throw (RuntimeException, std::exception) + throw (RuntimeException, std::exception) SAL_OVERRIDE { // temporary: set same stream again to clear buffer if ( m_out == aStream && m_pSaxWriterHelper && m_bDocStarted ) @@ -909,48 +909,48 @@ public: // XActiveDataSource } } virtual Reference< XOutputStream > SAL_CALL getOutputStream(void) - throw(RuntimeException, std::exception) + throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_out; } public: // XDocumentHandler virtual void SAL_CALL startDocument(void) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument(void) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, const Reference< XAttributeList > & xAttribs) - throw (SAXException, RuntimeException, std::exception); + throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endElement(const OUString& aName) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters(const OUString& aChars) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentLocator(const Reference< XLocator > & xLocator) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw(SAXException, RuntimeException, std::exception); - virtual void SAL_CALL endCDATA(void) throw(SAXException,RuntimeException, std::exception); + virtual void SAL_CALL startCDATA(void) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA(void) throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) - throw(SAXException, RuntimeException, std::exception); + throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL allowLineBreak(void) - throw(SAXException,RuntimeException, std::exception); + throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); + OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; private: diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 917a757e45cb..ce945af5bfdf 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -272,7 +272,7 @@ class ParserThread: public salhelper::Thread public: ParserThread(FastSaxParserImpl *pParser): Thread("Parser"), mpParser(pParser) {} private: - virtual void execute() + virtual void execute() SAL_OVERRIDE { try { @@ -335,10 +335,10 @@ public: void checkDispose() throw (RuntimeException) { if( !mpParser ) throw DisposedException(); } //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getLineNumber(void) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getPublicId(void) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getSystemId(void) throw (RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getLineNumber(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPublicId(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSystemId(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: FastSaxParserImpl *mpParser; diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index 0f20efc5f87e..89e9da8895db 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -189,16 +189,16 @@ private: mnCurrentElement( 0 ), maOrder( aOrder ) {} - void setCurrentElement( ::sal_Int32 nToken ); + void setCurrentElement( ::sal_Int32 nToken ) SAL_OVERRIDE; - virtual Int8Sequence& getData(); + virtual Int8Sequence& getData() SAL_OVERRIDE; #if OSL_DEBUG_LEVEL > 0 - virtual void print(); + virtual void print() SAL_OVERRIDE; #endif - virtual void prepend( const Int8Sequence &rWhat ); - virtual void append( const Int8Sequence &rWhat ); + virtual void prepend( const Int8Sequence &rWhat ) SAL_OVERRIDE; + virtual void append( const Int8Sequence &rWhat ) SAL_OVERRIDE; private: void sort(); }; |