From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- io/qa/textinputstream.cxx | 10 +- io/source/TextInputStream/TextInputStream.cxx | 28 ++-- io/source/TextOutputStream/TextOutputStream.cxx | 20 +-- io/source/acceptor/acc_pipe.cxx | 10 +- io/source/acceptor/acc_socket.cxx | 14 +- io/source/acceptor/acceptor.cxx | 10 +- io/source/connector/connector.cxx | 8 +- io/source/connector/connector.hxx | 24 ++-- io/source/stm/odata.cxx | 176 ++++++++++++------------ io/source/stm/omark.cxx | 72 +++++----- io/source/stm/opipe.cxx | 30 ++-- io/source/stm/opump.cxx | 30 ++-- io/source/stm/streamhelper.hxx | 2 +- 13 files changed, 217 insertions(+), 217 deletions(-) (limited to 'io') diff --git a/io/qa/textinputstream.cxx b/io/qa/textinputstream.cxx index 89fc32091571..48720ea24723 100644 --- a/io/qa/textinputstream.cxx +++ b/io/qa/textinputstream.cxx @@ -46,7 +46,7 @@ private: css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) - SAL_OVERRIDE + override { CPPUNIT_FAIL("readLine is supposed to call readSomeBytes instead"); return 0;} sal_Int32 SAL_CALL readSomeBytes( @@ -54,7 +54,7 @@ private: throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE + css::uno::RuntimeException, ::std::exception) override { assert(nMaxBytesToRead >= 0); osl::MutexGuard g(mutex_); @@ -74,7 +74,7 @@ private: throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::uno::RuntimeException, std::exception) override { assert(nBytesToSkip >= 0); osl::MutexGuard g(mutex_); @@ -87,7 +87,7 @@ private: sal_Int32 SAL_CALL available() throw ( css::io::NotConnectedException, css::io::IOException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::uno::RuntimeException, std::exception) override { osl::MutexGuard g(mutex_); checkClosed(); @@ -98,7 +98,7 @@ private: void SAL_CALL closeInput() throw ( css::io::NotConnectedException, css::io::IOException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::uno::RuntimeException, std::exception) override { osl::MutexGuard g(mutex_); checkClosed(); diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index edfe2f3c1864..6a4d97ba1a53 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -82,35 +82,35 @@ public: // Methods XTextInputStream virtual OUString SAL_CALL readLine( ) - throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(IOException, RuntimeException, std::exception) override; virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) - throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(IOException, RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isEOF( ) - throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException, std::exception) override; // Methods XInputStream virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, IOException, RuntimeException, std::exception) override; virtual void SAL_CALL closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, IOException, RuntimeException, std::exception) override; // Methods XActiveDataSink virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual Reference< XInputStream > SAL_CALL getInputStream() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; }; OTextInputStream::OTextInputStream() diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 2c9377e96971..8f8a44afe634 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -69,28 +69,28 @@ public: // Methods XTextOutputStream virtual void SAL_CALL writeString( const OUString& aString ) - throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(IOException, RuntimeException, std::exception) override; virtual void SAL_CALL setEncoding( const OUString& Encoding ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; // Methods XOutputStream virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; virtual void SAL_CALL closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; // Methods XActiveDataSource virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; }; OTextOutputStream::OTextOutputStream() diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 8fb7505a7ee3..9ca89e43511e 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -47,18 +47,18 @@ namespace io_acceptor virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: ::osl::StreamPipe m_pipe; oslInterlockedCount m_nStatus; diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index 96cfb369a03a..e5bdf63daf4d 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -75,24 +75,24 @@ namespace io_acceptor { virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XConnectionBroadcaster virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: void completeConnectionString(); diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 1c4b2301c351..43c86cd8bf75 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -57,13 +57,13 @@ namespace io_acceptor throw( AlreadyAcceptingException, ConnectionSetupException, IllegalArgumentException, - RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopAccepting( ) throw( RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; + virtual void SAL_CALL stopAccepting( ) throw( RuntimeException, std::exception) override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; private: PipeAcceptor *m_pPipe; diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 0bedf4dde13e..e564d3eb5669 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -57,12 +57,12 @@ namespace stoc_connector // Methods virtual Reference< XConnection > SAL_CALL connect( const OUString& sConnectionDescription ) - throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) SAL_OVERRIDE; + throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; }; OConnector::OConnector(const Reference< XComponentContext > &xCtx) diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index 820d9b730c6e..71d6abf01805 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -66,18 +66,18 @@ namespace stoc_connector virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: ::osl::StreamPipe m_pipe; oslInterlockedCount m_nStatus; @@ -95,25 +95,25 @@ namespace stoc_connector virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; // XConnectionBroadcaster virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; public: void completeConnectionString(); diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 892c7968610d..4459609a552c 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -67,48 +67,48 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL closeInput() throw ( NotConnectedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) override; + virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) override; + virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override; public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual Reference< XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) override; public: // XConnectable - virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) override; + virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) override; + virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) override; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (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; protected: @@ -512,46 +512,46 @@ public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; public: // XDataOutputStream - virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) override; public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) override; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Reference < XConnectable > SAL_CALL getPredecessor() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Reference < XConnectable > SAL_CALL getSuccessor() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (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; protected: Reference < XConnectable > m_succ; @@ -927,57 +927,57 @@ public: virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { ODataOutputStream::writeBytes( aData ); } virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { ODataOutputStream::flush(); } virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { ODataOutputStream::closeOutput(); } public: // XDataOutputStream - virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeBoolean( Value ); } - virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeByte( Value ); } - virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeChar( Value ); } - virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeShort( Value ); } - virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeLong( Value ); } - virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeHyper( Value ); } - virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeFloat( Value ); } - virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeDouble( Value ); } - virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) override { ODataOutputStream::writeUTF( Value );} // XObjectOutputStream - virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, IllegalArgumentException, 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: void connectToMarkable(); @@ -1193,67 +1193,67 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { return ODataInputStream::readBytes( aData , nBytesToRead ); } virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); } virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { ODataInputStream::skipBytes( nBytesToSkip ); } virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { return ODataInputStream::available(); } virtual void SAL_CALL closeInput() throw ( NotConnectedException, - RuntimeException, std::exception) SAL_OVERRIDE + RuntimeException, std::exception) override { ODataInputStream::closeInput(); } public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readBoolean(); } - virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readByte(); } - virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readChar(); } - virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readShort(); } - virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readLong(); } - virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readHyper(); } - virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readFloat(); } - virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readDouble(); } - virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override { return ODataInputStream::readUTF(); } public: // XObjectInputStream - virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; public: // XMarkableStream virtual sal_Int32 SAL_CALL createMark() - throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, IllegalArgumentException, 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: void connectToMarkable(); diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index a0902285bdf7..108a9aa5c945 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -81,52 +81,52 @@ public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; public: // XMarkable virtual sal_Int32 SAL_CALL createMark() - throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, RuntimeException, std::exception) override; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL jumpToFurthest() - throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Reference < XOutputStream > SAL_CALL getOutputStream() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) override; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual Reference< XConnectable > SAL_CALL getSuccessor() throw (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: // helper methods @@ -497,52 +497,52 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE ; + RuntimeException, std::exception) override ; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, - RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeInput() throw (NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; + virtual void SAL_CALL closeInput() throw (NotConnectedException, RuntimeException, std::exception) override; public: // XMarkable virtual sal_Int32 SAL_CALL createMark() - throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, RuntimeException, std::exception) override; virtual void SAL_CALL deleteMark(sal_Int32 Mark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, IllegalArgumentException, RuntimeException, std::exception) override; virtual void SAL_CALL jumpToFurthest() - throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; + throw (IOException, IllegalArgumentException,RuntimeException, std::exception) override; public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Reference < XInputStream > SAL_CALL getInputStream() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Reference < XConnectable > SAL_CALL getPredecessor() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) - throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (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: void checkMarksAndFlush(); diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 433d912bf777..ad59a0951288 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -61,50 +61,50 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; virtual void SAL_CALL closeInput() throw( NotConnectedException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference< XConnectable >& aPredecessor) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Reference< XConnectable > SAL_CALL getPredecessor() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; + virtual Reference< XConnectable > SAL_CALL getPredecessor() throw( RuntimeException, std::exception ) override; virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor() throw( RuntimeException, std::exception ) SAL_OVERRIDE ; + throw( RuntimeException, std::exception ) override; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw( 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: diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index d540455077ae..ac254d2a8d34 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -80,29 +80,29 @@ namespace io_stm { virtual ~Pump(); // XActiveDataSource - virtual void SAL_CALL setOutputStream( const Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw(std::exception) SAL_OVERRIDE; - virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOutputStream( const Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw(std::exception) override; + virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw(std::exception) override; // XActiveDataSink - virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw(std::exception) SAL_OVERRIDE; - virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw(std::exception) override; + virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw(std::exception) override; // XActiveDataControl - virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL start() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL terminate() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception) override; + virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception) override; + virtual void SAL_CALL start() throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL terminate() throw(std::exception) override; // XConnectable - virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw(std::exception) SAL_OVERRIDE; - virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw(std::exception) SAL_OVERRIDE; - virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw(std::exception) override; + virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) override; + virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw(std::exception) override; + virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) override; }; Pump::Pump() : m_aThread( 0 ), diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx index 436e8fc76930..463c185364e4 100644 --- a/io/source/stm/streamhelper.hxx +++ b/io/source/stm/streamhelper.hxx @@ -104,7 +104,7 @@ public: throw( I_FIFO_OutOfBoundsException ); sal_Int32 getSize() const throw() { return MemRingBuffer::getSize(); } - virtual void shrink() throw() SAL_OVERRIDE + virtual void shrink() throw() override { MemRingBuffer::shrink(); } }; -- cgit