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 --- 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 | 22 +-- 12 files changed, 222 insertions(+), 222 deletions(-) (limited to 'io') diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index b94c24dd149f..845d61ab4597 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -85,35 +85,35 @@ public: // Methods XTextInputStream virtual OUString SAL_CALL readLine( ) - throw(IOException, RuntimeException, std::exception); + throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) - throw(IOException, RuntimeException, std::exception); + throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isEOF( ) - throw(IOException, RuntimeException, std::exception); - virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException, std::exception); + throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException, std::exception) SAL_OVERRIDE; // Methods XInputStream virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; // Methods XActiveDataSink virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference< XInputStream > SAL_CALL getInputStream() - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; }; OTextInputStream::OTextInputStream() diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 5a388d16bd1b..94e4921f6bfc 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -72,28 +72,28 @@ public: // Methods XTextOutputStream virtual void SAL_CALL writeString( const OUString& aString ) - throw(IOException, RuntimeException, std::exception); + throw(IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEncoding( const OUString& Encoding ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; // Methods XOutputStream virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) SAL_OVERRIDE; // Methods XActiveDataSource virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) - throw(RuntimeException, std::exception); + throw(RuntimeException, std::exception) SAL_OVERRIDE; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; }; OTextOutputStream::OTextOutputStream() diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index fb982124305c..089ec627b9ab 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -46,18 +46,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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL write( const Sequence< sal_Int8 >& aData ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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 196b5613436d..99d738f9a137 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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: void completeConnectionString(); diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 6159d3e7188f..207ba21ff611 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -58,13 +58,13 @@ namespace io_acceptor throw( AlreadyAcceptingException, ConnectionSetupException, IllegalArgumentException, - RuntimeException, std::exception); - virtual void SAL_CALL stopAccepting( ) throw( RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL stopAccepting( ) throw( RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; private: PipeAcceptor *m_pPipe; diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index a580ba927981..4216aba03044 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -58,12 +58,12 @@ namespace stoc_connector // Methods virtual Reference< XConnection > SAL_CALL connect( const OUString& sConnectionDescription ) - throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception); + throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; }; OConnector::OConnector(const Reference< XComponentContext > &xCtx) diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index b15707abbadd..6579f75aab9b 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -64,18 +64,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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: ::osl::StreamPipe m_pipe; oslInterlockedCount m_nStatus; @@ -93,25 +93,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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush( ) throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL close( ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getDescription( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_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); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: void completeConnectionString(); diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index e93f1537a719..7dd5acb23baa 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -68,48 +68,48 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput(void) throw ( NotConnectedException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception); - virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception); - virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception); - virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception); - virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception); - virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception); - virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) - throw (RuntimeException, std::exception); - virtual Reference< XInputStream > SAL_CALL getInputStream(void) throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XInputStream > SAL_CALL getInputStream(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable - virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception); - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception); - virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception); - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception) ; + virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getPredecessor(void) 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(void) throw (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; protected: @@ -519,46 +519,46 @@ public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush(void) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput(void) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; public: // XDataOutputStream - virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception); + 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; public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) - throw (RuntimeException, std::exception); - virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference < XConnectable > SAL_CALL getPredecessor(void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference < XConnectable > SAL_CALL getSuccessor(void) - throw (RuntimeException, std::exception); + throw (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; protected: Reference < XConnectable > m_succ; @@ -940,57 +940,57 @@ public: virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeBytes( aData ); } virtual void SAL_CALL flush(void) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::flush(); } virtual void SAL_CALL closeOutput(void) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::closeOutput(); } public: // XDataOutputStream - virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeBoolean( Value ); } - virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeByte( Value ); } - virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeChar( Value ); } - virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeShort( Value ); } - virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeLong( Value ); } - virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeHyper( Value ); } - virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeFloat( Value ); } - virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeDouble( Value ); } - virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) + virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception) SAL_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); + virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark(void) throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception); - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception); - virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL createMark(void) 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(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception); + throw (IOException, IllegalArgumentException, 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: void connectToMarkable(); @@ -1206,67 +1206,67 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_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) + RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); } virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_OVERRIDE { ODataInputStream::skipBytes( nBytesToSkip ); } virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::available(); } virtual void SAL_CALL closeInput(void) throw ( NotConnectedException, - RuntimeException, std::exception) + RuntimeException, std::exception) SAL_OVERRIDE { ODataInputStream::closeInput(); } public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception) + virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readBoolean(); } - virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception) + virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readByte(); } - virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception) + virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readChar(); } - virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception) + virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readShort(); } - virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readLong(); } - virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception) + virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readHyper(); } - virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception) + virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readFloat(); } - virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception) + virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readDouble(); } - virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception) + virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception) SAL_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); + virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkableStream virtual sal_Int32 SAL_CALL createMark(void) - throw (IOException, RuntimeException, std::exception); - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception); - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception); - virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException, std::exception); + 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(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception); + throw (IOException, IllegalArgumentException, 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: void connectToMarkable(); diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 4e43b932bb74..c6db0594baa9 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); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL flush(void) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeOutput(void) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkable virtual sal_Int32 SAL_CALL createMark(void) - throw (IOException, RuntimeException, std::exception); + throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToFurthest(void) - throw (IOException, RuntimeException, std::exception); + throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) - throw (RuntimeException, std::exception); - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) - throw (RuntimeException, std::exception); - virtual Reference< XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XConnectable > SAL_CALL getSuccessor(void) throw (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: // 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) ; + RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, - RuntimeException, std::exception); - virtual void SAL_CALL closeInput(void) throw (NotConnectedException, RuntimeException, std::exception); + RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput(void) throw (NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkable virtual sal_Int32 SAL_CALL createMark(void) - throw (IOException, RuntimeException, std::exception); + throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception); + throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException, RuntimeException, std::exception); + throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToFurthest(void) - throw (IOException, RuntimeException, std::exception); + throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) - throw (IOException, IllegalArgumentException,RuntimeException, std::exception); + throw (IOException, IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference < XInputStream > SAL_CALL getInputStream(void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference < XConnectable > SAL_CALL getPredecessor(void) - throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) - throw (RuntimeException, std::exception); - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception); + throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (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: void checkMarksAndFlush(); diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index b090a5817a11..cdc02bfc0d55 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -63,50 +63,50 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available(void) throw( NotConnectedException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeInput(void) throw( NotConnectedException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL flush(void) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL closeOutput(void) throw( NotConnectedException, BufferSizeExceededException, - RuntimeException, std::exception ); + RuntimeException, std::exception ) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference< XConnectable >& aPredecessor) - throw( RuntimeException, std::exception ); - virtual Reference< XConnectable > SAL_CALL getPredecessor(void) throw( RuntimeException, std::exception ); + throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< XConnectable > SAL_CALL getPredecessor(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) - throw( RuntimeException, std::exception ); - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw( RuntimeException, std::exception ) ; + throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw( 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/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 6e81dff97b6e..ef8678a39129 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); - virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw(std::exception); + 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; // XActiveDataSink - virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw(std::exception); - virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw(std::exception); + 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; // XActiveDataControl - virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception); - virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception); - virtual void SAL_CALL start() throw( RuntimeException, std::exception ); - virtual void SAL_CALL terminate() throw(std::exception); + 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; // XConnectable - virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw(std::exception); - virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception); - virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw(std::exception); - virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception); + 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; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(std::exception ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ); + virtual OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; }; Pump::Pump() : m_aThread( 0 ), diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx index 40f275aaa937..4a31d47dade2 100644 --- a/io/source/stm/streamhelper.hxx +++ b/io/source/stm/streamhelper.hxx @@ -99,14 +99,14 @@ public: virtual void writeAt( sal_Int32 nPos, const Sequence &) throw( IRingBuffer_OutOfMemoryException, - IRingBuffer_OutOfBoundsException ); + IRingBuffer_OutOfBoundsException ) SAL_OVERRIDE; virtual void readAt( sal_Int32 nPos, Sequence & , sal_Int32 nBytesToRead ) const - throw( IRingBuffer_OutOfBoundsException ); - virtual sal_Int32 getSize() const throw( ); - virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException); - virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException); + throw( IRingBuffer_OutOfBoundsException ) SAL_OVERRIDE; + virtual sal_Int32 getSize() const throw( ) SAL_OVERRIDE; + virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException) SAL_OVERRIDE; + virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException) SAL_OVERRIDE; - virtual void shrink() throw(); + virtual void shrink() throw() SAL_OVERRIDE; private: @@ -133,13 +133,13 @@ class MemFIFO : { public: virtual void write( const Sequence &) throw( I_FIFO_OutOfMemoryException, - I_FIFO_OutOfBoundsException ); + I_FIFO_OutOfBoundsException ) SAL_OVERRIDE; virtual void read( Sequence & , sal_Int32 nBytesToRead ) - throw( I_FIFO_OutOfBoundsException ); - virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException ); - virtual sal_Int32 getSize() const throw( ) + throw( I_FIFO_OutOfBoundsException ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException ) SAL_OVERRIDE; + virtual sal_Int32 getSize() const throw( ) SAL_OVERRIDE { return MemRingBuffer::getSize(); } - virtual void shrink() throw() + virtual void shrink() throw() SAL_OVERRIDE { MemRingBuffer::shrink(); } }; -- cgit v1.2.3