diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /io | |
parent | 135907f2061550624ee1859745d94eee01849070 (diff) |
remove unnecessary use of void in function declarations
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'io')
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 8 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 4 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 4 | ||||
-rw-r--r-- | io/source/connector/connector.cxx | 4 | ||||
-rw-r--r-- | io/source/services.hxx | 16 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 136 | ||||
-rw-r--r-- | io/source/stm/omark.cxx | 60 | ||||
-rw-r--r-- | io/source/stm/opipe.cxx | 26 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 6 | ||||
-rw-r--r-- | io/test/stm/datatest.cxx | 22 | ||||
-rw-r--r-- | io/test/stm/marktest.cxx | 40 | ||||
-rw-r--r-- | io/test/stm/pipetest.cxx | 20 | ||||
-rw-r--r-- | io/test/stm/pumptest.cxx | 20 | ||||
-rw-r--r-- | io/test/stm/testfactreg.hxx | 8 |
14 files changed, 187 insertions, 187 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 09d2eec3da69..607f04104674 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -72,7 +72,7 @@ class OTextInputStream : public TextInputStreamHelper sal_Int32 mnCharsInBuffer; bool mbReachedEOF; - void implResizeBuffer( void ); + void implResizeBuffer(); OUString implReadString( const Sequence< sal_Unicode >& Delimiters, bool bRemoveDelimiter, bool bFindLineEnd ) throw(IOException, RuntimeException); @@ -111,7 +111,7 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; }; @@ -138,7 +138,7 @@ OTextInputStream::~OTextInputStream() delete[] mpBuffer; } -void OTextInputStream::implResizeBuffer( void ) +void OTextInputStream::implResizeBuffer() { sal_Int32 mnNewBufferSize = mnBufferSize * 2; sal_Unicode* pNewBuffer = new sal_Unicode[ mnNewBufferSize ]; @@ -461,7 +461,7 @@ sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw(st return cppu::supportsService(this, ServiceName); } -Sequence< OUString > OTextInputStream::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > OTextInputStream::getSupportedServiceNames() throw(std::exception) { return TextInputStream_getSupportedServiceNames(); } diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index e9f643329594..5d678a0a73c1 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -91,7 +91,7 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; }; @@ -270,7 +270,7 @@ sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw(s return cppu::supportsService(this, ServiceName); } -Sequence< OUString > OTextOutputStream::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > OTextOutputStream::getSupportedServiceNames() throw(std::exception) { return TextOutputStream_getSupportedServiceNames(); } diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index d58aa9d6d546..4791dc21b8c8 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -62,7 +62,7 @@ namespace io_acceptor public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; private: @@ -294,7 +294,7 @@ namespace io_acceptor return cppu::supportsService(this, ServiceName); } - Sequence< OUString > OAcceptor::getSupportedServiceNames(void) throw(std::exception) + Sequence< OUString > OAcceptor::getSupportedServiceNames() throw(std::exception) { return acceptor_getSupportedServiceNames(); } diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 81bfdb64ddb2..9b9477ff869f 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -61,7 +61,7 @@ namespace stoc_connector public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; }; @@ -197,7 +197,7 @@ namespace stoc_connector return cppu::supportsService(this, ServiceName); } - Sequence< OUString > OConnector::getSupportedServiceNames(void) throw(std::exception) + Sequence< OUString > OConnector::getSupportedServiceNames() throw(std::exception) { return connector_getSupportedServiceNames(); } diff --git a/io/source/services.hxx b/io/source/services.hxx index 89dc339195b2..e6a55da677a3 100644 --- a/io/source/services.hxx +++ b/io/source/services.hxx @@ -58,35 +58,35 @@ namespace io_TextOutputStream { namespace io_stm { Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OPipeImpl_getImplementationName(); - Sequence<OUString> OPipeImpl_getSupportedServiceNames(void); + Sequence<OUString> OPipeImpl_getSupportedServiceNames(); Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString ODataInputStream_getImplementationName(); - Sequence<OUString> ODataInputStream_getSupportedServiceNames(void); + Sequence<OUString> ODataInputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString ODataOutputStream_getImplementationName(); - Sequence<OUString> ODataOutputStream_getSupportedServiceNames(void); + Sequence<OUString> ODataOutputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OMarkableOutputStream_getImplementationName(); - Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void); + Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OMarkableInputStream_getImplementationName() ; - Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void); + Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception); OUString OObjectOutputStream_getImplementationName(); - Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void); + Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception); OUString OObjectInputStream_getImplementationName() ; - Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void); + Sequence<OUString> OObjectInputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OPumpImpl_getImplementationName(); - Sequence<OUString> OPumpImpl_getSupportedServiceNames(void); + Sequence<OUString> OPumpImpl_getSupportedServiceNames(); } #endif diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index e03ae4471787..fa289f15c398 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -76,39 +76,39 @@ public: // XInputStream virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, + virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeInput(void) throw ( NotConnectedException, + virtual void SAL_CALL closeInput() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XDataInputStream - 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; + 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; public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XInputStream > SAL_CALL getInputStream(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable 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 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(void) throw (RuntimeException, std::exception) SAL_OVERRIDE ; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE ; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; protected: @@ -173,7 +173,7 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip) } -sal_Int32 ODataInputStream::available(void) +sal_Int32 ODataInputStream::available() throw ( NotConnectedException, RuntimeException, std::exception) { @@ -190,7 +190,7 @@ sal_Int32 ODataInputStream::available(void) return nAvail; } -void ODataInputStream::closeInput(void ) +void ODataInputStream::closeInput() throw ( NotConnectedException, RuntimeException, std::exception) { @@ -213,12 +213,12 @@ void ODataInputStream::closeInput(void ) //== XDataInputStream =========================================== // XDataInputStream -sal_Int8 ODataInputStream::readBoolean(void) throw (IOException, RuntimeException, std::exception) +sal_Int8 ODataInputStream::readBoolean() throw (IOException, RuntimeException, std::exception) { return readByte(); } -sal_Int8 ODataInputStream::readByte(void) throw (IOException, RuntimeException, std::exception) +sal_Int8 ODataInputStream::readByte() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(1); if( 1 != readBytes( aTmp, 1 ) ) @@ -228,7 +228,7 @@ sal_Int8 ODataInputStream::readByte(void) throw (IOException, RuntimeExceptio return aTmp.getArray()[0]; } -sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeException, std::exception) +sal_Unicode ODataInputStream::readChar() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(2); if( 2 != readBytes( aTmp, 2 ) ) @@ -240,7 +240,7 @@ sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeExceptio return ((sal_Unicode)pBytes[0] << 8) + pBytes[1]; } -sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException, std::exception) +sal_Int16 ODataInputStream::readShort() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(2); if( 2 != readBytes( aTmp, 2 ) ) @@ -253,7 +253,7 @@ sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException } -sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException, std::exception) +sal_Int32 ODataInputStream::readLong() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(4); if( 4 != readBytes( aTmp, 4 ) ) @@ -266,7 +266,7 @@ sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException, } -sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException, std::exception) +sal_Int64 ODataInputStream::readHyper() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(8); if( 8 != readBytes( aTmp, 8 ) ) @@ -286,14 +286,14 @@ sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException pBytes[7]; } -float ODataInputStream::readFloat(void) throw (IOException, RuntimeException, std::exception) +float ODataInputStream::readFloat() throw (IOException, RuntimeException, std::exception) { union { float f; sal_uInt32 n; } a; a.n = readLong(); return a.f; } -double ODataInputStream::readDouble(void) throw (IOException, RuntimeException, std::exception) +double ODataInputStream::readDouble() throw (IOException, RuntimeException, std::exception) { union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a; #if defined OSL_LITENDIAN @@ -306,7 +306,7 @@ double ODataInputStream::readDouble(void) throw (IOException, RuntimeException, return a.d; } -OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException, std::exception) +OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std::exception) { sal_uInt16 nShortLen = (sal_uInt16)readShort(); sal_Int32 nUTFLen; @@ -401,7 +401,7 @@ void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream) m_bValidStream = m_input.is(); } -Reference< XInputStream > ODataInputStream::getInputStream(void) throw (RuntimeException, std::exception) +Reference< XInputStream > ODataInputStream::getInputStream() throw (RuntimeException, std::exception) { return m_input; } @@ -460,7 +460,7 @@ sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) throw (s } // XServiceInfo -Sequence< OUString > ODataInputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > ODataInputStream::getSupportedServiceNames() throw (std::exception) { return ODataInputStream_getSupportedServiceNames(); } @@ -485,7 +485,7 @@ OUString ODataInputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.DataInputStream"); } -Sequence<OUString> ODataInputStream_getSupportedServiceNames(void) +Sequence<OUString> ODataInputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.DataInputStream"; @@ -514,11 +514,11 @@ public: // XOutputStream throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -537,21 +537,21 @@ public: // XDataOutputStream public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) + 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(void) + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; protected: @@ -581,7 +581,7 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } } -void ODataOutputStream::flush(void) +void ODataOutputStream::flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -598,7 +598,7 @@ void ODataOutputStream::flush(void) } -void ODataOutputStream::closeOutput(void) +void ODataOutputStream::closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -791,7 +791,7 @@ void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStre } } -Reference< XOutputStream > ODataOutputStream::getOutputStream(void) +Reference< XOutputStream > ODataOutputStream::getOutputStream() throw (RuntimeException, std::exception) { return m_output; @@ -855,7 +855,7 @@ sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) throw ( } // XServiceInfo -Sequence< OUString > ODataOutputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > ODataOutputStream::getSupportedServiceNames() throw (std::exception) { return ODataOutputStream_getSupportedServiceNames(); } @@ -875,7 +875,7 @@ OUString ODataOutputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.DataOutputStream"); } -Sequence<OUString> ODataOutputStream_getSupportedServiceNames(void) +Sequence<OUString> ODataOutputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.DataOutputStream"; @@ -931,13 +931,13 @@ public: RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeBytes( aData ); } - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::flush(); } - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE @@ -968,16 +968,16 @@ public: 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) SAL_OVERRIDE; + 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(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; private: @@ -1060,7 +1060,7 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj -void OObjectOutputStream::connectToMarkable(void) +void OObjectOutputStream::connectToMarkable() { if( ! m_bValidMarkable ) { if( ! m_bValidStream ) @@ -1089,7 +1089,7 @@ void OObjectOutputStream::connectToMarkable(void) } -sal_Int32 OObjectOutputStream::createMark(void) +sal_Int32 OObjectOutputStream::createMark() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); // throws an exception, if a markable is not connected ! @@ -1118,7 +1118,7 @@ void OObjectOutputStream::jumpToMark(sal_Int32 nMark) } -void OObjectOutputStream::jumpToFurthest(void) +void OObjectOutputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); @@ -1151,7 +1151,7 @@ OUString OObjectOutputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.ObjectOutputStream"); } -Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void) +Sequence<OUString> OObjectOutputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.ObjectOutputStream"; @@ -1171,7 +1171,7 @@ sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) throw } // XServiceInfo -Sequence< OUString > OObjectOutputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() throw (std::exception) { return OObjectOutputStream_getSupportedServiceNames(); } @@ -1209,51 +1209,51 @@ public: // XInputStream RuntimeException, std::exception) SAL_OVERRIDE { ODataInputStream::skipBytes( nBytesToSkip ); } - virtual sal_Int32 SAL_CALL available(void) + virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::available(); } - virtual void SAL_CALL closeInput(void) + virtual void SAL_CALL closeInput() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE { ODataInputStream::closeInput(); } public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readBoolean(); } - virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readByte(); } - virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readChar(); } - virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readShort(); } - virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readLong(); } - virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readHyper(); } - virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readFloat(); } - virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readDouble(); } - virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL readUTF() 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) SAL_OVERRIDE; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark(void) + 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(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; private: @@ -1386,7 +1386,7 @@ void OObjectInputStream::connectToMarkable() } } -sal_Int32 OObjectInputStream::createMark(void) throw (IOException, RuntimeException, std::exception) +sal_Int32 OObjectInputStream::createMark() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); // throws an exception, if a markable is not connected ! @@ -1410,7 +1410,7 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, } m_rMarkable->jumpToMark( nMark ); } -void OObjectInputStream::jumpToFurthest(void) throw (IOException, RuntimeException, std::exception) +void OObjectInputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); m_rMarkable->jumpToFurthest(); @@ -1439,7 +1439,7 @@ sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) throw } // XServiceInfo -Sequence< OUString > OObjectInputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OObjectInputStream::getSupportedServiceNames() throw (std::exception) { return OObjectInputStream_getSupportedServiceNames(); } @@ -1455,7 +1455,7 @@ OUString OObjectInputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.ObjectInputStream"); } -Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void) +Sequence<OUString> OObjectInputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.ObjectInputStream"; diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 004842c7c9df..c3d6f1e55e0c 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -82,17 +82,17 @@ public: // XOutputStream throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkable - virtual sal_Int32 SAL_CALL createMark(void) + virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, @@ -102,7 +102,7 @@ public: // XMarkable throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest(void) + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, @@ -112,20 +112,20 @@ public: // XMarkable public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) + virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable 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 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(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; private: @@ -195,7 +195,7 @@ void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } } -void OMarkableOutputStream::flush(void) +void OMarkableOutputStream::flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -215,7 +215,7 @@ void OMarkableOutputStream::flush(void) } } -void OMarkableOutputStream::closeOutput(void) +void OMarkableOutputStream::closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -243,7 +243,7 @@ void OMarkableOutputStream::closeOutput(void) } -sal_Int32 OMarkableOutputStream::createMark(void) +sal_Int32 OMarkableOutputStream::createMark() throw ( IOException, RuntimeException, std::exception) { @@ -297,7 +297,7 @@ void OMarkableOutputStream::jumpToMark(sal_Int32 nMark) } } -void OMarkableOutputStream::jumpToFurthest(void) +void OMarkableOutputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { @@ -341,7 +341,7 @@ void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& a m_bValidStream = m_output.is(); } -Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException, std::exception) +Reference< XOutputStream > OMarkableOutputStream::getOutputStream() throw (RuntimeException, std::exception) { return m_output; } @@ -435,7 +435,7 @@ sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) thr } // XServiceInfo -Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames() throw (std::exception) { return OMarkableOutputStream_getSupportedServiceNames(); } @@ -459,7 +459,7 @@ OUString OMarkableOutputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.MarkableOutputStream"); } -Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void) +Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.MarkableOutputStream"; @@ -507,19 +507,19 @@ public: // XInputStream BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available(void) + virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeInput(void) throw (NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw (NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkable - virtual sal_Int32 SAL_CALL createMark(void) + 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(void) + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; @@ -527,21 +527,21 @@ public: // XMarkable public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XInputStream > SAL_CALL getInputStream(void) + virtual Reference < XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) + 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(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; private: @@ -718,7 +718,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip) readBytes( seqDummy , nBytesToSkip ); } -sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException, std::exception) +sal_Int32 OMarkableInputStream::available() throw (NotConnectedException, RuntimeException, std::exception) { sal_Int32 nAvail; if( m_bValidStream ) { @@ -736,7 +736,7 @@ sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, Ru } -void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException, std::exception) +void OMarkableInputStream::closeInput() throw (NotConnectedException, RuntimeException, std::exception) { if( m_bValidStream ) { MutexGuard guard( m_mutex ); @@ -761,7 +761,7 @@ void OMarkableInputStream::closeInput(void) throw (NotConnectedException, Runtim // XMarkable -sal_Int32 OMarkableInputStream::createMark(void) throw (IOException, RuntimeException, std::exception) +sal_Int32 OMarkableInputStream::createMark() throw (IOException, RuntimeException, std::exception) { MutexGuard guard( m_mutex ); sal_Int32 nMark = m_nCurrentMark; @@ -812,7 +812,7 @@ void OMarkableInputStream::jumpToMark(sal_Int32 nMark) } } -void OMarkableInputStream::jumpToFurthest(void) throw (IOException, RuntimeException, std::exception) +void OMarkableInputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { MutexGuard guard( m_mutex ); m_nCurrentPos = m_pBuffer->getSize(); @@ -860,7 +860,7 @@ void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStr } -Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException, std::exception) +Reference< XInputStream > OMarkableInputStream::getInputStream() throw (RuntimeException, std::exception) { return m_input; } @@ -951,7 +951,7 @@ sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) thro } // XServiceInfo -Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OMarkableInputStream::getSupportedServiceNames() throw (std::exception) { return OMarkableInputStream_getSupportedServiceNames(); } @@ -974,7 +974,7 @@ OUString OMarkableInputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.MarkableInputStream"); } -Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void) +Sequence<OUString> OMarkableInputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.MarkableInputStream"; diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 8f4f952b8281..4315a999c7a2 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -70,10 +70,10 @@ public: // XInputStream throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available(void) + virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput(void) + virtual void SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -83,11 +83,11 @@ public: // XOutputStream throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -95,15 +95,15 @@ public: // XOutputStream public: // XConnectable 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 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(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw( RuntimeException, std::exception ) SAL_OVERRIDE ; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; private: @@ -242,7 +242,7 @@ void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip) } -sal_Int32 OPipeImpl::available(void) +sal_Int32 OPipeImpl::available() throw( NotConnectedException, RuntimeException, std::exception ) { @@ -256,7 +256,7 @@ sal_Int32 OPipeImpl::available(void) return m_pFIFO->getSize(); } -void OPipeImpl::closeInput(void) +void OPipeImpl::closeInput() throw( NotConnectedException, RuntimeException, std::exception) { @@ -338,7 +338,7 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData) } -void OPipeImpl::flush(void) +void OPipeImpl::flush() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -347,7 +347,7 @@ void OPipeImpl::flush(void) return; } -void OPipeImpl::closeOutput(void) +void OPipeImpl::closeOutput() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -417,7 +417,7 @@ sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) throw(std::exce } // XServiceInfo -Sequence< OUString > OPipeImpl::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > OPipeImpl::getSupportedServiceNames() throw(std::exception ) { return OPipeImpl_getSupportedServiceNames(); } @@ -443,7 +443,7 @@ OUString OPipeImpl_getImplementationName() return OUString( IMPLEMENTATION_NAME ); } -Sequence<OUString> OPipeImpl_getSupportedServiceNames(void) +Sequence<OUString> OPipeImpl_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.Pipe"; diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 22e01d9f26cb..a45680048666 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -101,7 +101,7 @@ namespace io_stm { public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) 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; }; @@ -447,7 +447,7 @@ sal_Bool Pump::supportsService(const OUString& ServiceName) throw(std::exception } // XServiceInfo -Sequence< OUString > Pump::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > Pump::getSupportedServiceNames() throw(std::exception ) { return OPumpImpl_getSupportedServiceNames(); } @@ -465,7 +465,7 @@ OUString OPumpImpl_getImplementationName() return OUString("com.sun.star.comp.io.Pump"); } -Sequence<OUString> OPumpImpl_getSupportedServiceNames(void) +Sequence<OUString> OPumpImpl_getSupportedServiceNames() { OUString s("com.sun.star.io.Pump"); Sequence< OUString > seq( &s , 1 ); diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index ee378cf7066c..559f3e2a3c4a 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -79,10 +79,10 @@ public: throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XDataInputStream > & , const Reference < XDataOutputStream > &); @@ -222,25 +222,25 @@ sal_Int32 ODataStreamTest::test( -sal_Bool ODataStreamTest::testPassed(void) throw (RuntimeException) +sal_Bool ODataStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > ODataStreamTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > ODataStreamTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > ODataStreamTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > ODataStreamTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > ODataStreamTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > ODataStreamTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -384,7 +384,7 @@ public: public: - virtual OUString SAL_CALL getServiceName(void) throw (RuntimeException); + virtual OUString SAL_CALL getServiceName() throw (RuntimeException); virtual void SAL_CALL write( const Reference< XObjectOutputStream >& OutStream ) throw (IOException, RuntimeException); virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) @@ -392,7 +392,7 @@ public: public: - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException); virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue) @@ -446,7 +446,7 @@ public: -Reference <XPropertySetInfo > MyPersistObject::getPropertySetInfo(void) +Reference <XPropertySetInfo > MyPersistObject::getPropertySetInfo() throw (RuntimeException) { return Reference< XPropertySetInfo >(); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index a9866af396dc..d743e32bf3a4 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -51,7 +51,7 @@ public: ~OMarkableOutputStreamTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw (); + static Sequence< OUString > getSupportedServiceNames_Static() throw (); static OUString getImplementationName_Static() throw (); public: @@ -65,13 +65,13 @@ public: const Reference < XInterface >& TestObject, sal_Int32 hTestHandle) throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: @@ -174,25 +174,25 @@ sal_Int32 OMarkableOutputStreamTest::test( -sal_Bool OMarkableOutputStreamTest::testPassed(void) throw (RuntimeException) +sal_Bool OMarkableOutputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OMarkableOutputStreamTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OMarkableOutputStreamTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OMarkableOutputStreamTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OMarkableOutputStreamTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OMarkableOutputStreamTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OMarkableOutputStreamTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -375,7 +375,7 @@ Reference < XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( cons -Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) throw () +Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames() throw () { Sequence<OUString> aRet(1); aRet.getArray()[0] = OMarkableOutputStreamTest_getImplementationName(); @@ -410,7 +410,7 @@ public: ~OMarkableInputStreamTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw () ; + static Sequence< OUString > getSupportedServiceNames_Static() throw () ; static OUString getImplementationName_Static() throw () ; public: @@ -426,13 +426,13 @@ public: throw ( IllegalArgumentException, RuntimeException) ; - virtual sal_Bool SAL_CALL testPassed(void) + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: @@ -541,25 +541,25 @@ sal_Int32 OMarkableInputStreamTest::test( -sal_Bool OMarkableInputStreamTest::testPassed(void) throw (RuntimeException) +sal_Bool OMarkableInputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OMarkableInputStreamTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OMarkableInputStreamTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OMarkableInputStreamTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OMarkableInputStreamTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OMarkableInputStreamTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OMarkableInputStreamTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -647,7 +647,7 @@ Reference < XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const -Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw () +Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames() throw () { Sequence<OUString> aRet(1); aRet.getArray()[0] = OMarkableInputStreamTest_getImplementationName(); diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx index 2aadab0db005..f2ad64308ae5 100644 --- a/io/test/stm/pipetest.cxx +++ b/io/test/stm/pipetest.cxx @@ -98,7 +98,7 @@ public: ~OPipeTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); static OUString getImplementationName_Static() throw(); public: @@ -111,10 +111,10 @@ public: throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException) ; - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException) ; - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException) ; + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException) ; + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XInterface > & ); @@ -206,25 +206,25 @@ sal_Int32 OPipeTest::test( -sal_Bool OPipeTest::testPassed(void) throw (RuntimeException) +sal_Bool OPipeTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OPipeTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OPipeTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OPipeTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OPipeTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OPipeTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OPipeTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -409,7 +409,7 @@ Reference < XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMu -Sequence<OUString> OPipeTest_getSupportedServiceNames(void) throw() +Sequence<OUString> OPipeTest_getSupportedServiceNames() throw() { Sequence<OUString> aRet(1); aRet.getArray()[0] = OPipeTest_getServiceName(); diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index d911cd1b42ca..34a9a783ef8b 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -67,7 +67,7 @@ public: ~OPumpTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); static OUString getImplementationName_Static() throw(); public: @@ -80,10 +80,10 @@ public: throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException) ; - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException) ; - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException) ; + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException) ; + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XInterface > & ); @@ -190,25 +190,25 @@ sal_Int32 OPumpTest::test( -sal_Bool OPumpTest::testPassed(void) throw (RuntimeException) +sal_Bool OPumpTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OPumpTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OPumpTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OPumpTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OPumpTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OPumpTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OPumpTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -420,7 +420,7 @@ Reference< XInterface > SAL_CALL OPumpTest_CreateInstance( const Reference< XMul return *new OPumpTest( rSMgr ); } -Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw() +Sequence<OUString> OPumpTest_getSupportedServiceNames() throw() { OUString s = OPumpTest_getServiceName(); Sequence< OUString > seq( &s , 1 ); diff --git a/io/test/stm/testfactreg.hxx b/io/test/stm/testfactreg.hxx index 6578bc5d320e..787a6faef428 100644 --- a/io/test/stm/testfactreg.hxx +++ b/io/test/stm/testfactreg.hxx @@ -23,12 +23,12 @@ #include <rtl/strbuf.hxx> Reference< XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); -Sequence<OUString> OPipeTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OPipeTest_getSupportedServiceNames() throw(); OUString OPipeTest_getServiceName() throw(); OUString OPipeTest_getImplementationName() throw(); Reference< XInterface > SAL_CALL OPumpTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); -Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OPumpTest_getSupportedServiceNames() throw(); OUString OPumpTest_getServiceName() throw(); OUString OPumpTest_getImplementationName() throw(); @@ -38,12 +38,12 @@ OUString ODataStreamTest_getServiceName( int i) throw(); OUString ODataStreamTest_getImplementationName( int i) throw(); Reference< XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception); -Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames() throw(); OUString OMarkableOutputStreamTest_getServiceName() throw(); OUString OMarkableOutputStreamTest_getImplementationName() throw(); Reference< XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception); -Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames() throw(); OUString OMarkableInputStreamTest_getServiceName() throw(); OUString OMarkableInputStreamTest_getImplementationName() throw(); |