summaryrefslogtreecommitdiff
path: root/sax
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 /sax
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sax')
-rw-r--r--sax/qa/cppunit/parser.cxx8
-rw-r--r--sax/qa/cppunit/test_converter.cxx4
-rw-r--r--sax/source/expatwrap/attrlistimpl.hxx14
-rw-r--r--sax/source/expatwrap/sax_expat.cxx34
-rw-r--r--sax/source/expatwrap/saxwriter.cxx36
-rw-r--r--sax/source/fastparser/fastparser.cxx10
-rw-r--r--sax/source/tools/fastserializer.hxx12
7 files changed, 59 insertions, 59 deletions
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index e3f0ef91cfc4..83102038f956 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -30,12 +30,12 @@ public:
virtual ~DummyTokenHandler() {}
virtual sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence<sal_Int8>& )
- throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (uno::RuntimeException, std::exception) override
{
return FastToken::DONTKNOW;
}
virtual uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 )
- throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
+ throw (uno::RuntimeException, std::exception) override
{
CPPUNIT_ASSERT_MESSAGE( "getUTF8Identifier: unexpected call", false );
return uno::Sequence<sal_Int8>();
@@ -50,8 +50,8 @@ class ParserTest: public test::BootstrapFixture
uno::Reference< DummyTokenHandler > mxTokenHandler;
public:
- virtual void setUp() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
void parse();
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index 6de224a84151..67290d59facd 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() SAL_OVERRIDE;
- virtual void tearDown() SAL_OVERRIDE;
+ virtual void setUp() override;
+ virtual void tearDown() override;
void testDuration();
void testDateTime();
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index e3afa15cbf08..6a476385a81b 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()
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getTypeByName(const OUString& aName)
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
- throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValueByName(const OUString& aName)
- throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw( ::com::sun::star::uno::RuntimeException, std::exception) override;
// XCloneable
virtual ::com::sun::star::uno::Reference< XCloneable > SAL_CALL
- createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
private:
struct AttributeList_impl *m_pImpl;
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 51c997ffc91f..5ca04d8f8e71 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -109,29 +109,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) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
// The SAX-Parser-Interface
virtual void SAL_CALL parseStream( const InputSource& structSource)
throw ( SAXException,
IOException,
- css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentHandler(const css::uno::Reference< XDocumentHandler > & xHandler)
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setErrorHandler(const css::uno::Reference< XErrorHandler > & xHandler)
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setDTDHandler(const css::uno::Reference < XDTDHandler > & xHandler)
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setEntityResolver(const css::uno::Reference< XEntityResolver >& xResolver)
- throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setLocale( const Locale &locale ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setLocale( const Locale &locale ) throw (css::uno::RuntimeException, std::exception) override;
public: // XServiceInfo
- OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE;
- css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE;
+ OUString SAL_CALL getImplementationName() throw (std::exception) override;
+ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) override;
private:
@@ -327,33 +327,33 @@ public:
}
public: //XLocator
- virtual sal_Int32 SAL_CALL getColumnNumber() throw (std::exception) SAL_OVERRIDE
+ virtual sal_Int32 SAL_CALL getColumnNumber() throw (std::exception) override
{
return XML_GetCurrentColumnNumber( m_pParser->getEntity().pParser );
}
- virtual sal_Int32 SAL_CALL getLineNumber() throw (std::exception) SAL_OVERRIDE
+ virtual sal_Int32 SAL_CALL getLineNumber() throw (std::exception) override
{
return XML_GetCurrentLineNumber( m_pParser->getEntity().pParser );
}
- virtual OUString SAL_CALL getPublicId() throw (std::exception) SAL_OVERRIDE
+ virtual OUString SAL_CALL getPublicId() throw (std::exception) override
{
return m_pParser->getEntity().structSource.sPublicId;
}
- virtual OUString SAL_CALL getSystemId() throw (std::exception) SAL_OVERRIDE
+ virtual OUString SAL_CALL getSystemId() throw (std::exception) override
{
return m_pParser->getEntity().structSource.sSystemId;
}
// XSeekable (only for getPosition)
- virtual void SAL_CALL seek( sal_Int64 ) throw(std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL seek( sal_Int64 ) throw(std::exception) override
{
}
- virtual sal_Int64 SAL_CALL getPosition() throw(std::exception) SAL_OVERRIDE
+ virtual sal_Int64 SAL_CALL getPosition() throw(std::exception) override
{
return XML_GetCurrentByteIndex( m_pParser->getEntity().pParser );
}
- virtual ::sal_Int64 SAL_CALL getLength() throw(std::exception) SAL_OVERRIDE
+ virtual ::sal_Int64 SAL_CALL getLength() throw(std::exception) override
{
return 0;
}
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 42151196990d..9c5b94f53301 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -890,7 +890,7 @@ public:
public: // XActiveDataSource
virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream)
- throw (RuntimeException, std::exception) SAL_OVERRIDE
+ throw (RuntimeException, std::exception) override
{
try
{
@@ -916,50 +916,50 @@ public: // XActiveDataSource
}
}
virtual Reference< XOutputStream > SAL_CALL getOutputStream()
- throw(RuntimeException, std::exception) SAL_OVERRIDE
+ throw(RuntimeException, std::exception) override
{
return m_out;
}
public: // XDocumentHandler
virtual void SAL_CALL startDocument()
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL endDocument()
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL startElement(const OUString& aName,
const Reference< XAttributeList > & xAttribs)
- throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL endElement(const OUString& aName)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL characters(const OUString& aChars)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL processingInstruction(const OUString& aTarget,
const OUString& aData)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL setDocumentLocator(const Reference< XLocator > & xLocator)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
public: // XExtendedDocumentHandler
- virtual void SAL_CALL startCDATA() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL endCDATA() throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL startCDATA() throw(SAXException, RuntimeException, std::exception) override;
+ virtual void SAL_CALL endCDATA() throw(SAXException,RuntimeException, std::exception) override;
virtual void SAL_CALL comment(const OUString& sComment)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL unknown(const OUString& sString)
- throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException, RuntimeException, std::exception) override;
virtual void SAL_CALL allowLineBreak()
- throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE;
+ throw(SAXException,RuntimeException, std::exception) override;
public: // XServiceInfo
- OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE;
- Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE;
+ OUString SAL_CALL getImplementationName() throw(std::exception) override;
+ Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
private:
sal_Int32 getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurrence ) throw();
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 86cc85892602..15edc08ee3f7 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() SAL_OVERRIDE
+ virtual void execute() override
{
try
{
@@ -337,10 +337,10 @@ public:
void checkDispose() throw (RuntimeException) { if( !mpParser ) throw DisposedException(); }
//XLocator
- virtual sal_Int32 SAL_CALL getColumnNumber() throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Int32 SAL_CALL getLineNumber() throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Int32 SAL_CALL getColumnNumber() throw (RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getLineNumber() throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception) override;
private:
FastSaxParserImpl *mpParser;
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index d5925fd9ebd8..cbcf4b2a6c34 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -186,7 +186,7 @@ private:
#endif
virtual void prepend( const Int8Sequence &rWhat );
- virtual void append( const Int8Sequence &rWhat ) SAL_OVERRIDE;
+ virtual void append( const Int8Sequence &rWhat ) override;
void postpone( const Int8Sequence &rWhat );
protected:
@@ -208,16 +208,16 @@ private:
, maOrder( rOrder )
{}
- void setCurrentElement( ::sal_Int32 nToken ) SAL_OVERRIDE;
+ void setCurrentElement( ::sal_Int32 nToken ) override;
- virtual Int8Sequence& getData() SAL_OVERRIDE;
+ virtual Int8Sequence& getData() override;
#if OSL_DEBUG_LEVEL > 0
- virtual void print() SAL_OVERRIDE;
+ virtual void print() override;
#endif
- virtual void prepend( const Int8Sequence &rWhat ) SAL_OVERRIDE;
- virtual void append( const Int8Sequence &rWhat ) SAL_OVERRIDE;
+ virtual void prepend( const Int8Sequence &rWhat ) override;
+ virtual void append( const Int8Sequence &rWhat ) override;
private:
void sort();
};