diff options
Diffstat (limited to 'io/source')
-rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 80 | ||||
-rw-r--r-- | io/source/TextOutputStream/TextOutputStream.cxx | 48 | ||||
-rw-r--r-- | io/source/acceptor/acc_pipe.cxx | 16 | ||||
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 48 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.cxx | 2 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.hxx | 14 | ||||
-rw-r--r-- | io/source/acceptor/acceptor.xml | 58 | ||||
-rw-r--r-- | io/source/connector/connector.cxx | 2 | ||||
-rw-r--r-- | io/source/connector/connector.hxx | 24 | ||||
-rw-r--r-- | io/source/connector/connectr.xml | 58 | ||||
-rw-r--r-- | io/source/connector/ctr_pipe.cxx | 4 | ||||
-rw-r--r-- | io/source/connector/ctr_socket.cxx | 28 | ||||
-rw-r--r-- | io/source/stm/factreg.cxx | 14 | ||||
-rw-r--r-- | io/source/stm/factreg.hxx | 14 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 130 | ||||
-rw-r--r-- | io/source/stm/omark.cxx | 136 | ||||
-rw-r--r-- | io/source/stm/opipe.cxx | 20 | ||||
-rw-r--r-- | io/source/stm/opump.cxx | 36 | ||||
-rw-r--r-- | io/source/stm/stm.xml | 386 | ||||
-rw-r--r-- | io/source/stm/streamhelper.cxx | 10 | ||||
-rw-r--r-- | io/source/stm/streamhelper.hxx | 56 |
21 files changed, 592 insertions, 592 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index e8beb3f4a63a..2191c33c703b 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,8 +71,8 @@ namespace io_TextInputStream typedef WeakImplHelper3< XTextInputStream, XActiveDataSink, XServiceInfo > TextInputStreamHelper; class OCommandEnvironment; -#define INITIAL_UNICODE_BUFFER_CAPACITY 0x100 -#define READ_BYTE_COUNT 0x100 +#define INITIAL_UNICODE_BUFFER_CAPACITY 0x100 +#define READ_BYTE_COUNT 0x100 class OTextInputStream : public TextInputStreamHelper { @@ -81,9 +81,9 @@ class OTextInputStream : public TextInputStreamHelper // Encoding OUString mEncoding; sal_Bool mbEncodingInitialized; - rtl_TextToUnicodeConverter mConvText2Unicode; - rtl_TextToUnicodeContext mContextText2Unicode; - Sequence<sal_Int8> mSeqSource; + rtl_TextToUnicodeConverter mConvText2Unicode; + rtl_TextToUnicodeContext mContextText2Unicode; + Sequence<sal_Int8> mSeqSource; // Internal buffer for characters that are already converted successfully sal_Unicode* mpBuffer; @@ -92,40 +92,40 @@ class OTextInputStream : public TextInputStreamHelper sal_Bool mbReachedEOF; void implResizeBuffer( void ); - OUString implReadString( const Sequence< sal_Unicode >& Delimiters, - sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd ) + OUString implReadString( const Sequence< sal_Unicode >& Delimiters, + sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd ) throw(IOException, RuntimeException); sal_Int32 implReadNext() throw(IOException, RuntimeException); - + public: OTextInputStream(); virtual ~OTextInputStream(); // Methods XTextInputStream - virtual OUString SAL_CALL readLine( ) + virtual OUString SAL_CALL readLine( ) throw(IOException, RuntimeException); - virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) + virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) throw(IOException, RuntimeException); - virtual sal_Bool SAL_CALL isEOF( ) + virtual sal_Bool SAL_CALL isEOF( ) throw(IOException, RuntimeException); virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException); // Methods XInputStream - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) + virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual sal_Int32 SAL_CALL available( ) + virtual sal_Int32 SAL_CALL available( ) throw(NotConnectedException, IOException, RuntimeException); - virtual void SAL_CALL closeInput( ) + virtual void SAL_CALL closeInput( ) throw(NotConnectedException, IOException, RuntimeException); // Methods XActiveDataSink - virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) + virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) throw(RuntimeException); - virtual Reference< XInputStream > SAL_CALL getInputStream() + virtual Reference< XInputStream > SAL_CALL getInputStream() throw(RuntimeException); // Methods XServiceInfo @@ -165,20 +165,20 @@ void OTextInputStream::implResizeBuffer( void ) //=========================================================================== // XTextInputStream -OUString OTextInputStream::readLine( ) +OUString OTextInputStream::readLine( ) throw(IOException, RuntimeException) { static Sequence< sal_Unicode > aDummySeq; return implReadString( aDummySeq, sal_True, sal_True ); } -OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool ) +OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool ) throw(IOException, RuntimeException) { return implReadString( Delimiters, sal_True, sal_False ); } -sal_Bool OTextInputStream::isEOF() +sal_Bool OTextInputStream::isEOF() throw(IOException, RuntimeException) { sal_Bool bRet = sal_False; @@ -188,8 +188,8 @@ sal_Bool OTextInputStream::isEOF() } -OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimiters, - sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd ) +OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimiters, + sal_Bool bRemoveDelimiter, sal_Bool bFindLineEnd ) throw(IOException, RuntimeException) { OUString aRetStr; @@ -232,9 +232,9 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi break; } - // Now there should be characters available + // Now there should be characters available // (otherwise the loop should have been breaked before) - sal_Unicode c = mpBuffer[ nBufferReadPos++ ]; + sal_Unicode c = mpBuffer[ nBufferReadPos++ ]; if( bFindLineEnd ) { @@ -286,7 +286,7 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi aRetStr = OUString( mpBuffer, nCopyLen ); // Copy rest of buffer - memmove( mpBuffer, mpBuffer + nBufferReadPos, + memmove( mpBuffer, mpBuffer + nBufferReadPos, (mnCharsInBuffer - nBufferReadPos) * sizeof( sal_Unicode ) ); mnCharsInBuffer -= nBufferReadPos; @@ -294,7 +294,7 @@ OUString OTextInputStream::implReadString( const Sequence< sal_Unicode >& Delimi } -sal_Int32 OTextInputStream::implReadNext() +sal_Int32 OTextInputStream::implReadNext() throw(IOException, RuntimeException) { sal_Int32 nFreeBufferSize = mnBufferSize - mnCharsInBuffer; @@ -320,7 +320,7 @@ sal_Int32 OTextInputStream::implReadNext() const sal_Int8 *pbSource = mSeqSource.getConstArray(); // All invalid characters are transformed to the unicode undefined char - nTargetCount += rtl_convertTextToUnicode( + nTargetCount += rtl_convertTextToUnicode( mConvText2Unicode, mContextText2Unicode, (const sal_Char*) &( pbSource[nSourceCount] ), @@ -333,15 +333,15 @@ sal_Int32 OTextInputStream::implReadNext() &uiInfo, &nSrcCvtBytes ); nSourceCount += nSrcCvtBytes; - + sal_Bool bCont = sal_False; - if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL ) + if( uiInfo & RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL ) { implResizeBuffer(); bCont = sal_True; } - if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL ) + if( uiInfo & RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL ) { // read next byte static Sequence< sal_Int8 > aOneByteSeq( 1 ); @@ -382,12 +382,12 @@ sal_Int32 OTextInputStream::implReadNext() } } -void OTextInputStream::setEncoding( const OUString& Encoding ) +void OTextInputStream::setEncoding( const OUString& Encoding ) throw(RuntimeException) { OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US ); rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() ); - if( RTL_TEXTENCODING_DONTKNOW == encoding ) + if( RTL_TEXTENCODING_DONTKNOW == encoding ) return; mbEncodingInitialized = true; @@ -399,7 +399,7 @@ void OTextInputStream::setEncoding( const OUString& Encoding ) //=========================================================================== // XInputStream -sal_Int32 OTextInputStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) +sal_Int32 OTextInputStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { return mxStream->readBytes( aData, nBytesToRead ); @@ -417,13 +417,13 @@ void OTextInputStream::skipBytes( sal_Int32 nBytesToSkip ) mxStream->skipBytes( nBytesToSkip ); } -sal_Int32 OTextInputStream::available( ) +sal_Int32 OTextInputStream::available( ) throw(NotConnectedException, IOException, RuntimeException) { return mxStream->available(); } -void OTextInputStream::closeInput( ) +void OTextInputStream::closeInput( ) throw(NotConnectedException, IOException, RuntimeException) { mxStream->closeInput(); @@ -433,7 +433,7 @@ void OTextInputStream::closeInput( ) //=========================================================================== // XActiveDataSink -void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream ) +void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream ) throw(RuntimeException) { mxStream = aStream; @@ -481,11 +481,11 @@ sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw() { Sequence< OUString > aSNL = getSupportedServiceNames(); const OUString * pArray = aSNL.getConstArray(); - + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; - + return sal_False; } diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index f71e7f216034..fa6aecde2d00 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,8 +75,8 @@ class OTextOutputStream : public TextOutputStreamHelper // Encoding OUString mEncoding; sal_Bool mbEncodingInitialized; - rtl_UnicodeToTextConverter mConvUnicode2Text; - rtl_UnicodeToTextContext mContextUnicode2Text; + rtl_UnicodeToTextConverter mConvUnicode2Text; + rtl_UnicodeToTextContext mContextUnicode2Text; Sequence<sal_Int8> implConvert( const OUString& rSource ); @@ -85,23 +85,23 @@ public: ~OTextOutputStream(); // Methods XTextOutputStream - virtual void SAL_CALL writeString( const OUString& aString ) + virtual void SAL_CALL writeString( const OUString& aString ) throw(IOException, RuntimeException); - virtual void SAL_CALL setEncoding( const OUString& Encoding ) + virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException); // Methods XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual void SAL_CALL flush( ) + virtual void SAL_CALL flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual void SAL_CALL closeOutput( ) + virtual void SAL_CALL closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); // Methods XActiveDataSource - virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) + virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream ) throw(RuntimeException); - virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) + virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw(RuntimeException); // Methods XServiceInfo @@ -131,7 +131,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource ) sal_Size nTargetCount = 0; sal_Size nSourceCount = 0; - + sal_uInt32 uiInfo; sal_Size nSrcCvtChars; @@ -142,7 +142,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource ) Sequence<sal_Int8> seqText( nSeqSize ); sal_Char *pTarget = (sal_Char *) seqText.getArray(); - while( sal_True ) + while( sal_True ) { nTargetCount += rtl_convertUnicodeToText( mConvUnicode2Text, @@ -156,8 +156,8 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource ) &uiInfo, &nSrcCvtChars); nSourceCount += nSrcCvtChars; - - if( uiInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL ) + + if( uiInfo & RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL ) { nSeqSize *= 2; seqText.realloc( nSeqSize ); // double array size @@ -176,7 +176,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource ) //=========================================================================== // XTextOutputStream -void OTextOutputStream::writeString( const OUString& aString ) +void OTextOutputStream::writeString( const OUString& aString ) throw(IOException, RuntimeException) { if( !mbEncodingInitialized ) @@ -191,35 +191,35 @@ void OTextOutputStream::writeString( const OUString& aString ) mxStream->writeBytes( aByteSeq ); } -void OTextOutputStream::setEncoding( const OUString& Encoding ) +void OTextOutputStream::setEncoding( const OUString& Encoding ) throw(RuntimeException) { OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US ); rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() ); - if( RTL_TEXTENCODING_DONTKNOW == encoding ) + if( RTL_TEXTENCODING_DONTKNOW == encoding ) return; mbEncodingInitialized = true; - mConvUnicode2Text = rtl_createUnicodeToTextConverter( encoding ); + mConvUnicode2Text = rtl_createUnicodeToTextConverter( encoding ); mContextUnicode2Text = rtl_createUnicodeToTextContext( mConvUnicode2Text ); mEncoding = Encoding; } //=========================================================================== // XOutputStream -void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData ) +void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { mxStream->writeBytes( aData ); } -void OTextOutputStream::flush( ) +void OTextOutputStream::flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { mxStream->flush(); } -void OTextOutputStream::closeOutput( ) +void OTextOutputStream::closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { mxStream->closeOutput(); @@ -229,7 +229,7 @@ void OTextOutputStream::closeOutput( ) //=========================================================================== // XActiveDataSource -void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream ) +void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream ) throw(RuntimeException) { mxStream = aStream; @@ -278,11 +278,11 @@ sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw() { Sequence< OUString > aSNL = getSupportedServiceNames(); const OUString * pArray = aSNL.getConstArray(); - + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; - + return sal_False; } diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 27a298bf5c7f..61efcb724e12 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,14 +47,14 @@ namespace io_acceptor { typedef WeakImplHelper1< XConnection > MyPipeConnection; - + class PipeConnection : public MyPipeConnection { public: PipeConnection( const OUString &sConnectionDescription); ~PipeConnection(); - + virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ namespace io_acceptor OUString m_sDescription; }; - + PipeConnection::PipeConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), @@ -95,7 +95,7 @@ namespace io_acceptor { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } - + sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) @@ -130,7 +130,7 @@ namespace io_acceptor } void PipeConnection::flush( ) - throw( ::com::sun::star::io::IOException, + throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { } @@ -150,9 +150,9 @@ namespace io_acceptor { return m_sDescription; } - + /*************** - * PipeAcceptor + * PipeAcceptor **************/ PipeAcceptor::PipeAcceptor( const OUString &sPipeName , const OUString & sConnectionDescription) : m_sPipeName( sPipeName ), diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index de362b1f51d2..3c4f7eacd4ec 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace io_acceptor { template<class T> struct ReferenceEqual { - sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, + sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, const ::com::sun::star::uno::Reference<T> & op2) const { return op1.get() == op2.get(); @@ -68,21 +68,21 @@ namespace io_acceptor { }; - typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, - ReferenceHash< ::com::sun::star::io::XStreamListener>, + typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; - class SocketConnection : public ::cppu::WeakImplHelper2< + class SocketConnection : public ::cppu::WeakImplHelper2< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster> - + { public: SocketConnection( const OUString & sConnectionDescription ); ~SocketConnection(); - + virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, @@ -100,14 +100,14 @@ namespace io_acceptor { throw(::com::sun::star::uno::RuntimeException); // XConnectionBroadcaster - virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) + virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) + virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) throw(::com::sun::star::uno::RuntimeException); public: void completeConnectionString(); - + ::osl::StreamSocket m_socket; ::osl::SocketAddr m_addr; oslInterlockedCount m_nStatus; @@ -127,7 +127,7 @@ namespace io_acceptor { { ::osl::MutexGuard guard(pCon->_mutex); - if(!*notified) + if(!*notified) { *notified = sal_True; listeners = pCon->_listeners; @@ -165,7 +165,7 @@ namespace io_acceptor { xStreamListener->closed(); } - + SocketConnection::SocketConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ), @@ -194,7 +194,7 @@ namespace io_acceptor { buf.append( (sal_Int32) m_socket.getPeerPort() ); buf.appendAscii( ",peerHost=" ); buf.append( m_socket.getPeerHost( ) ); - + buf.appendAscii( ",localPort=" ); buf.append( (sal_Int32) m_socket.getLocalPort() ); buf.appendAscii( ",localHost=" ); @@ -222,15 +222,15 @@ namespace io_acceptor { if(i != nBytesToRead) { OUString message(RTL_CONSTASCII_USTRINGPARAM("acc_socket.cxx:SocketConnection::read: error - ")); - message += m_socket.getErrorAsString(); - + message += m_socket.getErrorAsString(); + IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this))); - + Any any; any <<= ioException; - + notifyListeners(this, &_error, callError(any)); - + throw ioException; } @@ -261,12 +261,12 @@ namespace io_acceptor { { OUString message(RTL_CONSTASCII_USTRINGPARAM("acc_socket.cxx:SocketConnection::write: error - ")); message += m_socket.getErrorAsString(); - + IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this))); - + Any any; any <<= ioException; - + notifyListeners(this, &_error, callError(any)); throw ioException; @@ -360,7 +360,7 @@ namespace io_acceptor { message.makeStringAndClear(), Reference< XInterface > () ); } m_socket.setOption( osl_Socket_OptionReuseAddr, 1); - + if(! m_socket.bind(m_addr) ) { OUStringBuffer message( 128 ); @@ -370,13 +370,13 @@ namespace io_acceptor { message.makeStringAndClear(), Reference<XInterface>()); } - + if(! m_socket.listen() ) { OUStringBuffer message( 128 ); message.appendAscii( "acc_socket.cxx:SocketAcceptor::init - error - can't listen on " ); message.append( m_sSocketName ).appendAscii( ":" ).append( (sal_Int32) m_nPort); - throw ConnectionSetupException( message.makeStringAndClear(),Reference<XInterface>() ); + throw ConnectionSetupException( message.makeStringAndClear(),Reference<XInterface>() ); } } diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index 3edca9d0841e..487f173ba24d 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx index 963adc1f1460..ff031028e1d8 100644 --- a/io/source/acceptor/acceptor.hxx +++ b/io/source/acceptor/acceptor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,19 +40,19 @@ namespace io_acceptor { { public: PipeAcceptor( const ::rtl::OUString &sPipeName , const ::rtl::OUString &sConnectionDescription ); - + void init(); ::com::sun::star::uno::Reference < ::com::sun::star::connection::XConnection > accept( ); - + void stopAccepting(); - + ::osl::Mutex m_mutex; ::osl::Pipe m_pipe; ::rtl::OUString m_sPipeName; ::rtl::OUString m_sConnectionDescription; sal_Bool m_bClosed; }; - + class SocketAcceptor { public: @@ -65,7 +65,7 @@ namespace io_acceptor { ::com::sun::star::uno::Reference < ::com::sun::star::connection::XConnection > accept(); void stopAccepting(); - + ::osl::SocketAddr m_addr; ::osl::AcceptorSocket m_socket; ::rtl::OUString m_sSocketName; @@ -74,7 +74,7 @@ namespace io_acceptor { sal_Bool m_bTcpNoDelay; sal_Bool m_bClosed; }; - + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml index 2a2d3a76afb2..920b37ecedf2 100644 --- a/io/source/acceptor/acceptor.xml +++ b/io/source/acceptor/acceptor.xml @@ -1,42 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> acceptor.uno </module-name> + <module-name> acceptor.uno </module-name> <component-description> <author> Joerg Budischewski </author> - <name> com.sun.star.comp.io.Acceptor </name> + <name> com.sun.star.comp.io.Acceptor </name> <description> This component allows to accept an connect-attempt from a different process. </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> <status value="final"/> - <supported-service> com.sun.star.connection.Acceptor </supported-service> - <service-dependency> ... </service-dependency> - <type> com.sun.star.connection.XAcceptor </type> + <supported-service> com.sun.star.connection.Acceptor </supported-service> + <service-dependency> ... </service-dependency> + <type> com.sun.star.connection.XAcceptor </type> <type> com.sun.star.connection.XConnectionBroadcaster </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 4ba32fc54a26..da55d8417337 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index ed4015ded0a5..fd53b5120df5 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace stoc_connector { extern rtl_StandardModuleCount g_moduleCount; - + template<class T> struct ReferenceHash { @@ -53,26 +53,26 @@ namespace stoc_connector template<class T> struct ReferenceEqual { - sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, + sal_Bool operator () (const ::com::sun::star::uno::Reference<T> & op1, const ::com::sun::star::uno::Reference<T> & op2) const { return op1.get() == op2.get(); } }; - typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, - ReferenceHash< ::com::sun::star::io::XStreamListener>, + typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; class PipeConnection : public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection > - + { public: PipeConnection( const ::rtl::OUString &sConnectionDescription ); virtual ~PipeConnection(); - + virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, @@ -96,12 +96,12 @@ namespace stoc_connector class SocketConnection : public ::cppu::WeakImplHelper2< ::com::sun::star::connection::XConnection, ::com::sun::star::connection::XConnectionBroadcaster > - + { public: SocketConnection( const ::rtl::OUString & sConnectionDescription ); virtual ~SocketConnection(); - + virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, @@ -120,14 +120,14 @@ namespace stoc_connector // XConnectionBroadcaster - virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) + virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) + virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener) throw(::com::sun::star::uno::RuntimeException); public: void completeConnectionString(); - + ::osl::ConnectorSocket m_socket; ::osl::SocketAddr m_addr; oslInterlockedCount m_nStatus; diff --git a/io/source/connector/connectr.xml b/io/source/connector/connectr.xml index cdeb0df7edec..5f324f7b9677 100644 --- a/io/source/connector/connectr.xml +++ b/io/source/connector/connectr.xml @@ -1,42 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> connector.uno </module-name> + <module-name> connector.uno </module-name> <component-description> <author> Joerg Budischewski </author> - <name> com.sun.star.comp.io.Connector </name> + <name> com.sun.star.comp.io.Connector </name> <description> This component allows to establish a connection to another process. </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> <status value="final"/> - <supported-service> com.sun.star.connection.Connector </supported-service> - <service-dependency> ... </service-dependency> - <type> com.sun.star.connection.XConnector </type> + <supported-service> com.sun.star.connection.Connector </supported-service> + <service-dependency> ... </service-dependency> + <type> com.sun.star.connection.XConnector </type> <type> com.sun.star.connection.XConnectionBroadcaster </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper2 </runtime-module-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> + <runtime-module-dependency> cppuhelper2 </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx index 3069d0523794..8a347a7a7c01 100644 --- a/io/source/connector/ctr_pipe.cxx +++ b/io/source/connector/ctr_pipe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ using namespace ::com::sun::star::connection; namespace stoc_connector { - + PipeConnection::PipeConnection( const OUString & sConnectionDescription ) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ) diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 1fdd69429190..8d802eb92448 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace stoc_connector { { ::osl::MutexGuard guard(pCon->_mutex); - if(!*notified) + if(!*notified) { *notified = sal_True; listeners = pCon->_listeners; @@ -87,7 +87,7 @@ namespace stoc_connector { xStreamListener->closed(); } - + SocketConnection::SocketConnection( const OUString &sConnectionDescription ) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ), @@ -108,7 +108,7 @@ namespace stoc_connector { { g_moduleCount.modCnt.release( &g_moduleCount.modCnt ); } - + void SocketConnection::completeConnectionString() { sal_Int32 nPort; @@ -128,7 +128,7 @@ namespace stoc_connector { m_sDescription += buf.makeStringAndClear(); } - + sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) @@ -147,20 +147,20 @@ namespace stoc_connector { { OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::read: error - ")); message += m_socket.getErrorAsString(); - + IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this))); - + Any any; any <<= ioException; - + notifyListeners(this, &_error, callError(any)); - + throw ioException; } return i; } - else + else { OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::read: error - connection already closed")); @@ -185,18 +185,18 @@ namespace stoc_connector { { OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::write: error - ")); message += m_socket.getErrorAsString(); - + IOException ioException(message, Reference<XInterface>(static_cast<XConnection *>(this))); - + Any any; any <<= ioException; - + notifyListeners(this, &_error, callError(any)); throw ioException; } } - else + else { OUString message(RTL_CONSTASCII_USTRINGPARAM("ctr_socket.cxx:SocketConnection::write: error - connection already closed")); diff --git a/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx index 9b9a8a68384b..215b943e31f6 100644 --- a/io/source/stm/factreg.cxx +++ b/io/source/stm/factreg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ static struct ImplementationEntry g_entries[] = { ODataInputStream_CreateInstance, ODataInputStream_getImplementationName, ODataInputStream_getSupportedServiceNames, createSingleComponentFactory, - &g_moduleCount.modCnt, 0 + &g_moduleCount.modCnt, 0 }, { ODataOutputStream_CreateInstance, ODataOutputStream_getImplementationName, @@ -75,7 +75,7 @@ static struct ImplementationEntry g_entries[] = { OObjectInputStream_CreateInstance, OObjectInputStream_getImplementationName, OObjectInputStream_getSupportedServiceNames, createSingleComponentFactory, - &g_moduleCount.modCnt, 0 + &g_moduleCount.modCnt, 0 }, { OObjectOutputStream_CreateInstance, OObjectOutputStream_getImplementationName, @@ -85,15 +85,15 @@ static struct ImplementationEntry g_entries[] = { OMarkableInputStream_CreateInstance, OMarkableInputStream_getImplementationName, OMarkableInputStream_getSupportedServiceNames, createSingleComponentFactory, - &g_moduleCount.modCnt, 0 + &g_moduleCount.modCnt, 0 }, { OMarkableOutputStream_CreateInstance, OMarkableOutputStream_getImplementationName, OMarkableOutputStream_getSupportedServiceNames, createSingleComponentFactory, - &g_moduleCount.modCnt, 0 + &g_moduleCount.modCnt, 0 }, { 0, 0, 0, 0, 0, 0 } - + }; extern "C" @@ -103,7 +103,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } - + //================================================================================================== void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) diff --git a/io/source/stm/factreg.hxx b/io/source/stm/factreg.hxx index 56c097671c89..80cf2a9b4deb 100644 --- a/io/source/stm/factreg.hxx +++ b/io/source/stm/factreg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,14 +30,14 @@ namespace io_stm { extern rtl_StandardModuleCount g_moduleCount; - -// OPipeImpl + +// OPipeImpl Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); -OUString OPipeImpl_getImplementationName(); +OUString OPipeImpl_getImplementationName(); Sequence<OUString> OPipeImpl_getSupportedServiceNames(void); Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); -OUString ODataInputStream_getImplementationName(); +OUString ODataInputStream_getImplementationName(); Sequence<OUString> ODataInputStream_getSupportedServiceNames(void); Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); @@ -49,7 +49,7 @@ OUString OMarkableOutputStream_getImplementationName(); Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void); Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); -OUString OMarkableInputStream_getImplementationName() ; +OUString OMarkableInputStream_getImplementationName() ; Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void); Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception); @@ -57,7 +57,7 @@ OUString OObjectOutputStream_getImplementationName(); Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void); Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception); -OUString OObjectInputStream_getImplementationName() ; +OUString OObjectInputStream_getImplementationName() ; Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void); Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index b5be8e855ba9..9e76659b5d9a 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -85,19 +85,19 @@ public: ~ODataInputStream(); public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, + virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, RuntimeException); - virtual void SAL_CALL closeInput(void) throw ( NotConnectedException, + virtual void SAL_CALL closeInput(void) throw ( NotConnectedException, RuntimeException); public: // XDataInputStream @@ -132,9 +132,9 @@ public: // XServiceInfo protected: - Reference < XConnectable > m_pred; - Reference < XConnectable > m_succ; - Reference < XInputStream > m_input; + Reference < XConnectable > m_pred; + Reference < XConnectable > m_succ; + Reference < XInputStream > m_input; sal_Bool m_bValidStream; }; @@ -145,7 +145,7 @@ ODataInputStream::~ODataInputStream() // XInputStream sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -164,7 +164,7 @@ sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBy } sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -179,7 +179,7 @@ sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 return nRead; } void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -194,7 +194,7 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip) sal_Int32 ODataInputStream::available(void) - throw ( NotConnectedException, + throw ( NotConnectedException, RuntimeException) { sal_Int32 nAvail; @@ -211,7 +211,7 @@ sal_Int32 ODataInputStream::available(void) } void ODataInputStream::closeInput(void ) - throw ( NotConnectedException, + throw ( NotConnectedException, RuntimeException) { if( m_bValidStream ) { @@ -238,7 +238,7 @@ sal_Int8 ODataInputStream::readBoolean(void) throw (IOException, RuntimeExceptio return readByte(); } -sal_Int8 ODataInputStream::readByte(void) throw (IOException, RuntimeException) +sal_Int8 ODataInputStream::readByte(void) throw (IOException, RuntimeException) { Sequence<sal_Int8> aTmp(1); if( 1 != readBytes( aTmp, 1 ) ) @@ -334,8 +334,8 @@ double ODataInputStream::readDouble(void) throw (IOException, RuntimeException) OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException) { - sal_uInt16 nShortLen = (sal_uInt16)readShort(); - sal_Int32 nUTFLen; + sal_uInt16 nShortLen = (sal_uInt16)readShort(); + sal_Int32 nUTFLen; if( ((sal_uInt16)0xffff) == nShortLen ) { @@ -348,8 +348,8 @@ OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException) nUTFLen = ( sal_Int32 ) nShortLen; } - Sequence<sal_Unicode> aBuffer( nUTFLen ); - sal_Unicode * pStr = aBuffer.getArray(); + Sequence<sal_Unicode> aBuffer( nUTFLen ); + sal_Unicode * pStr = aBuffer.getArray(); sal_Int32 nCount = 0; sal_Int32 nStrLen = 0; @@ -543,15 +543,15 @@ public: public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); virtual void SAL_CALL flush(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); virtual void SAL_CALL closeOutput(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); @@ -587,8 +587,8 @@ public: // XServiceInfo sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (); protected: - Reference < XConnectable > m_succ; - Reference < XConnectable > m_pred; + Reference < XConnectable > m_succ; + Reference < XConnectable > m_pred; Reference< XOutputStream > m_output; sal_Bool m_bValidStream; }; @@ -601,7 +601,7 @@ ODataOutputStream::~ODataOutputStream() // XOutputStream void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -615,7 +615,7 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } void ODataOutputStream::flush(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -632,7 +632,7 @@ void ODataOutputStream::flush(void) void ODataOutputStream::closeOutput(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -651,7 +651,7 @@ void ODataOutputStream::closeOutput(void) // XDataOutputStream void ODataOutputStream::writeBoolean(sal_Bool Value) - throw ( IOException, + throw ( IOException, RuntimeException) { if( Value ) @@ -666,7 +666,7 @@ void ODataOutputStream::writeBoolean(sal_Bool Value) void ODataOutputStream::writeByte(sal_Int8 Value) - throw ( IOException, + throw ( IOException, RuntimeException) { Sequence<sal_Int8> aTmp( 1 ); @@ -675,7 +675,7 @@ void ODataOutputStream::writeByte(sal_Int8 Value) } void ODataOutputStream::writeChar(sal_Unicode Value) - throw ( IOException, + throw ( IOException, RuntimeException) { Sequence<sal_Int8> aTmp( 2 ); @@ -687,7 +687,7 @@ void ODataOutputStream::writeChar(sal_Unicode Value) void ODataOutputStream::writeShort(sal_Int16 Value) - throw ( IOException, + throw ( IOException, RuntimeException) { Sequence<sal_Int8> aTmp( 2 ); @@ -698,7 +698,7 @@ void ODataOutputStream::writeShort(sal_Int16 Value) } void ODataOutputStream::writeLong(sal_Int32 Value) - throw ( IOException, + throw ( IOException, RuntimeException) { Sequence<sal_Int8> aTmp( 4 ); @@ -711,7 +711,7 @@ void ODataOutputStream::writeLong(sal_Int32 Value) } void ODataOutputStream::writeHyper(sal_Int64 Value) - throw ( IOException, + throw ( IOException, RuntimeException) { Sequence<sal_Int8> aTmp( 8 ); @@ -729,7 +729,7 @@ void ODataOutputStream::writeHyper(sal_Int64 Value) void ODataOutputStream::writeFloat(float Value) - throw ( IOException, + throw ( IOException, RuntimeException) { union { float f; sal_uInt32 n; } a; @@ -738,7 +738,7 @@ void ODataOutputStream::writeFloat(float Value) } void ODataOutputStream::writeDouble(double Value) - throw ( IOException, + throw ( IOException, RuntimeException) { sal_uInt32 n = 1; @@ -759,7 +759,7 @@ void ODataOutputStream::writeDouble(double Value) } void ODataOutputStream::writeUTF(const OUString& Value) - throw ( IOException, + throw ( IOException, RuntimeException) { sal_Int32 nStrLen = Value.getLength(); @@ -860,14 +860,14 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r ) } } } -Reference < XConnectable > ODataOutputStream::getSuccessor() throw (RuntimeException) +Reference < XConnectable > ODataOutputStream::getSuccessor() throw (RuntimeException) { return m_succ; } // XDataSource -void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) throw (RuntimeException) +void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) throw (RuntimeException) { if( r != m_pred ) { m_pred = r; @@ -877,7 +877,7 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) } } } -Reference < XConnectable > ODataOutputStream::getPredecessor() throw (RuntimeException) +Reference < XConnectable > ODataOutputStream::getPredecessor() throw (RuntimeException) { return m_pred; } @@ -988,19 +988,19 @@ public: public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { ODataOutputStream::writeBytes( aData ); } virtual void SAL_CALL flush(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { ODataOutputStream::flush(); } virtual void SAL_CALL closeOutput(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { ODataOutputStream::closeOutput(); } @@ -1030,10 +1030,10 @@ public: virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark(void) throw (IOException, RuntimeException); - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException); - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException); - virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException); + virtual sal_Int32 SAL_CALL createMark(void) throw (IOException, RuntimeException); + virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException); + virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException); + virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException); virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException); @@ -1051,10 +1051,10 @@ public: // XServiceInfo private: void connectToMarkable(); private: - ObjectContainer_Impl m_mapObject; - sal_Int32 m_nMaxId; - Reference< XMarkableStream > m_rMarkable; - sal_Bool m_bValidMarkable; + ObjectContainer_Impl m_mapObject; + sal_Int32 m_nMaxId; + Reference< XMarkableStream > m_rMarkable; + sal_Bool m_bValidMarkable; }; OObjectOutputStream::~OObjectOutputStream() @@ -1175,7 +1175,7 @@ void OObjectOutputStream::connectToMarkable(void) sal_Int32 OObjectOutputStream::createMark(void) throw (IOException, RuntimeException) { - connectToMarkable(); // throws an exception, if a markable is not connected ! + connectToMarkable(); // throws an exception, if a markable is not connected ! return m_rMarkable->createMark(); } @@ -1325,30 +1325,30 @@ public: public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { return ODataInputStream::readBytes( aData , nBytesToRead ); } virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); } virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { ODataInputStream::skipBytes( nBytesToSkip ); } virtual sal_Int32 SAL_CALL available(void) - throw ( NotConnectedException, + throw ( NotConnectedException, RuntimeException) { return ODataInputStream::available(); } virtual void SAL_CALL closeInput(void) - throw ( NotConnectedException, + throw ( NotConnectedException, RuntimeException) { ODataInputStream::closeInput(); } @@ -1378,9 +1378,9 @@ public: // XObjectInputStream public: // XMarkableStream virtual sal_Int32 SAL_CALL createMark(void) throw (IOException, RuntimeException); - virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException); - virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException); - virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException); + virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException); + virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException); + virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException); virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException); @@ -1400,7 +1400,7 @@ private: private: Reference < XMultiComponentFactory > m_rSMgr; Reference < XComponentContext > m_rCxt; - sal_Bool m_bValidMarkable; + sal_Bool m_bValidMarkable; Reference < XMarkableStream > m_rMarkable; vector < Reference< XPersistObject > > m_aPersistVector; @@ -1541,14 +1541,14 @@ void OObjectInputStream::connectToMarkable() } } -sal_Int32 OObjectInputStream::createMark(void) throw (IOException, RuntimeException) +sal_Int32 OObjectInputStream::createMark(void) throw (IOException, RuntimeException) { - connectToMarkable(); // throws an exception, if a markable is not connected ! + connectToMarkable(); // throws an exception, if a markable is not connected ! return m_rMarkable->createMark(); } -void OObjectInputStream::deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException) +void OObjectInputStream::deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException) { if( ! m_bValidMarkable ) { @@ -1557,7 +1557,7 @@ void OObjectInputStream::deleteMark(sal_Int32 Mark) throw (IOException, m_rMarkable->deleteMark( Mark ); } -void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException) +void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException) { if( ! m_bValidMarkable ) { @@ -1565,7 +1565,7 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, } m_rMarkable->jumpToMark( nMark ); } -void OObjectInputStream::jumpToFurthest(void) throw (IOException, RuntimeException) +void OObjectInputStream::jumpToFurthest(void) throw (IOException, RuntimeException) { connectToMarkable(); m_rMarkable->jumpToFurthest(); diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 792920c2667a..13ce6db616ef 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,15 +89,15 @@ public: public: // XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); virtual void SAL_CALL flush(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); virtual void SAL_CALL closeOutput(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); @@ -173,7 +173,7 @@ OMarkableOutputStream::~OMarkableOutputStream() // XOutputStream void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -207,7 +207,7 @@ void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } void OMarkableOutputStream::flush(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -227,7 +227,7 @@ void OMarkableOutputStream::flush(void) } void OMarkableOutputStream::closeOutput(void) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -352,7 +352,7 @@ void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& a m_bValidStream = m_output.is(); } -Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException) +Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException) { return m_output; } @@ -373,7 +373,7 @@ void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r ) } } } -Reference <XConnectable > OMarkableOutputStream::getSuccessor() throw (RuntimeException) +Reference <XConnectable > OMarkableOutputStream::getSuccessor() throw (RuntimeException) { return m_succ; } @@ -399,7 +399,7 @@ Reference < XConnectable > OMarkableOutputStream::getPredecessor() throw (Runtim // private methods -void OMarkableOutputStream::checkMarksAndFlush() throw( NotConnectedException, +void OMarkableOutputStream::checkMarksAndFlush() throw( NotConnectedException, BufferSizeExceededException) { map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii; @@ -473,7 +473,7 @@ Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Ref return Reference < XInterface > ( ( OWeakObject * ) p ); } -OUString OMarkableOutputStream_getImplementationName() +OUString OMarkableOutputStream_getImplementationName() { return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.io.stm.MarkableOutputStream" )); } @@ -514,15 +514,15 @@ public: public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) ; virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException); @@ -566,8 +566,8 @@ public: // XServiceInfo private: void checkMarksAndFlush(); - Reference < XConnectable > m_succ; - Reference < XConnectable > m_pred; + Reference < XConnectable > m_succ; + Reference < XConnectable > m_pred; Reference< XInputStream > m_input; sal_Bool m_bValidStream; @@ -603,7 +603,7 @@ OMarkableInputStream::~OMarkableInputStream() // XInputStream sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -660,7 +660,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) - throw ( NotConnectedException, + throw ( NotConnectedException, BufferSizeExceededException, RuntimeException) { @@ -678,20 +678,20 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I sal_Int32 nInBuffer = m_pBuffer->getSize() - m_nCurrentPos; sal_Int32 nAdditionalBytesToRead = Min(nMaxBytesToRead-nInBuffer,m_input->available()); nAdditionalBytesToRead = Max(0 , nAdditionalBytesToRead ); - - // read enough bytes into buffer + + // read enough bytes into buffer if( 0 == nInBuffer ) { - nRead = m_input->readSomeBytes( aData , nMaxBytesToRead ); + nRead = m_input->readSomeBytes( aData , nMaxBytesToRead ); } else if( nAdditionalBytesToRead ) { - nRead = m_input->readBytes( aData , nAdditionalBytesToRead ); + nRead = m_input->readBytes( aData , nAdditionalBytesToRead ); } - + if( nRead ) { aData.realloc( nRead ); try { - m_pBuffer->writeAt( m_pBuffer->getSize() , aData ); + m_pBuffer->writeAt( m_pBuffer->getSize() , aData ); } catch( IRingBuffer_OutOfMemoryException & ) { @@ -702,9 +702,9 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I throw BufferSizeExceededException(); } } - + nBytesRead = Min( nMaxBytesToRead , nInBuffer + nRead ); - + // now take everything from buffer ! m_pBuffer->readAt( m_nCurrentPos , aData , nBytesRead ); @@ -715,7 +715,7 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I { throw NotConnectedException( OUString( RTL_CONSTASCII_USTRINGPARAM("MarkableInputStream::readSomeBytes NotConnectedException")) , - *this ); + *this ); } return nBytesRead; @@ -724,8 +724,8 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip) - throw ( NotConnectedException, - BufferSizeExceededException, + throw ( NotConnectedException, + BufferSizeExceededException, RuntimeException) { if ( nBytesToSkip < 0 ) @@ -734,10 +734,10 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip) *this ); - // this method is blocking + // this method is blocking sal_Int32 nRead; Sequence<sal_Int8> seqDummy( nBytesToSkip ); - + nRead = readBytes( seqDummy , nBytesToSkip ); } @@ -759,17 +759,17 @@ sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, Ru } -void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException) +void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException) { if( m_bValidStream ) { MutexGuard guard( m_mutex ); m_input->closeInput(); - + setInputStream( Reference< XInputStream > () ); setPredecessor( Reference< XConnectable > () ); setSuccessor( Reference< XConnectable >() ); - + delete m_pBuffer; m_pBuffer = 0; m_nCurrentPos = 0; @@ -784,22 +784,22 @@ void OMarkableInputStream::closeInput(void) throw (NotConnectedException, Runtim // XMarkable -sal_Int32 OMarkableInputStream::createMark(void) throw (IOException, RuntimeException) +sal_Int32 OMarkableInputStream::createMark(void) throw (IOException, RuntimeException) { MutexGuard guard( m_mutex ); sal_Int32 nMark = m_nCurrentMark; - + m_mapMarks[nMark] = m_nCurrentPos; - + m_nCurrentMark ++; return nMark; } -void OMarkableInputStream::deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException) +void OMarkableInputStream::deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException) { MutexGuard guard( m_mutex ); map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark ); - + if( ii == m_mapMarks.end() ) { OUStringBuffer buf( 128 ); buf.appendAscii( "MarkableInputStream::deleteMark unknown mark (" ); @@ -809,18 +809,18 @@ void OMarkableInputStream::deleteMark(sal_Int32 Mark) throw (IOException, } else { m_mapMarks.erase( ii ); - checkMarksAndFlush(); - } + checkMarksAndFlush(); + } } void OMarkableInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, - IllegalArgumentException, + IllegalArgumentException, RuntimeException) { MutexGuard guard( m_mutex ); map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark ); - + if( ii == m_mapMarks.end() ) { OUStringBuffer buf( 128 ); @@ -832,24 +832,24 @@ void OMarkableInputStream::jumpToMark(sal_Int32 nMark) else { m_nCurrentPos = (*ii).second; - } + } } -void OMarkableInputStream::jumpToFurthest(void) throw (IOException, RuntimeException) +void OMarkableInputStream::jumpToFurthest(void) throw (IOException, RuntimeException) { MutexGuard guard( m_mutex ); - m_nCurrentPos = m_pBuffer->getSize(); - checkMarksAndFlush(); + m_nCurrentPos = m_pBuffer->getSize(); + checkMarksAndFlush(); } sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark) - throw (IOException, + throw (IOException, IllegalArgumentException, RuntimeException) { MutexGuard guard( m_mutex ); map<sal_Int32,sal_Int32,less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark ); - + if( ii == m_mapMarks.end() ) { OUStringBuffer buf( 128 ); @@ -871,19 +871,19 @@ sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark) void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException) { - + if( m_input != aStream ) { m_input = aStream; - + Reference < XConnectable > pred( m_input , UNO_QUERY ); setPredecessor( pred ); } - - m_bValidStream = m_input.is(); - + + m_bValidStream = m_input.is(); + } -Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException) +Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException) { return m_input; } @@ -899,7 +899,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r ) /// store the reference for later use m_succ = r; - if( m_succ.is() ) { + if( m_succ.is() ) { /// set this instance as the sink ! m_succ->setPredecessor( Reference< XConnectable > ( SAL_STATIC_CAST( XConnectable * , this ) ) ); @@ -909,7 +909,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r ) Reference < XConnectable > OMarkableInputStream::getSuccessor() throw (RuntimeException) { - return m_succ; + return m_succ; } @@ -923,7 +923,7 @@ void OMarkableInputStream::setPredecessor( const Reference < XConnectable > &r m_pred->setSuccessor( Reference< XConnectable > ( SAL_STATIC_CAST( XConnectable * , this ) ) ); } - } + } } Reference< XConnectable > OMarkableInputStream::getPredecessor() throw (RuntimeException) { @@ -936,12 +936,12 @@ Reference< XConnectable > OMarkableInputStream::getPredecessor() throw (Runtime void OMarkableInputStream::checkMarksAndFlush() { map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii; - + // find the smallest mark sal_Int32 nNextFound = m_nCurrentPos; for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) { if( (*ii).second <= nNextFound ) { - nNextFound = (*ii).second; + nNextFound = (*ii).second; } } @@ -951,26 +951,26 @@ void OMarkableInputStream::checkMarksAndFlush() for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ii ++ ) { (*ii).second -= nNextFound; } - + m_pBuffer->forgetFromStart( nNextFound ); } else { // nothing to do. There is a mark or the current cursor position, that prevents // releasing data ! - } + } } // XServiceInfo -OUString OMarkableInputStream::getImplementationName() throw () +OUString OMarkableInputStream::getImplementationName() throw () { return OMarkableInputStream_getImplementationName(); } // XServiceInfo -sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw () +sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw () { Sequence< OUString > aSNL = getSupportedServiceNames(); const OUString * pArray = aSNL.getConstArray(); @@ -983,7 +983,7 @@ sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) thro } // XServiceInfo -Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw () +Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw () { return OMarkableInputStream_getSupportedServiceNames(); } @@ -996,12 +996,12 @@ Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw *------------------------*/ Reference < XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference < XComponentContext > & ) throw(Exception) -{ - OMarkableInputStream *p = new OMarkableInputStream( ); +{ + OMarkableInputStream *p = new OMarkableInputStream( ); return Reference< XInterface > ( (OWeakObject * ) p ); } -OUString OMarkableInputStream_getImplementationName() +OUString OMarkableInputStream_getImplementationName() { return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.io.stm.MarkableInputStream" )); } diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index b17ce4081e0a..9072dfd5d0d0 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ using namespace ::com::sun::star::lang; #include "streamhelper.hxx" // Implementation and service names -#define IMPLEMENTATION_NAME "com.sun.star.comp.io.stm.Pipe" +#define IMPLEMENTATION_NAME "com.sun.star.comp.io.stm.Pipe" #define SERVICE_NAME "com.sun.star.io.Pipe" namespace io_stm{ @@ -71,7 +71,7 @@ public: public: // XInputStream virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw( NotConnectedException, + throw( NotConnectedException, BufferSizeExceededException, RuntimeException ); virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) @@ -123,8 +123,8 @@ private: // DEBUG inline void checkInvariant(); - Reference < XConnectable > m_succ; - Reference < XConnectable > m_pred; + Reference < XConnectable > m_succ; + Reference < XConnectable > m_pred; sal_Int32 m_nBytesToSkip; @@ -135,7 +135,7 @@ private: oslCondition m_conditionBytesAvail; Mutex m_mutexAccess; - I_FIFO *m_pFIFO; + I_FIFO *m_pFIFO; }; @@ -145,8 +145,8 @@ OPipeImpl::OPipeImpl() g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); m_nBytesToSkip = 0; - m_bOutputStreamClosed = sal_False; - m_bInputStreamClosed = sal_False; + m_bOutputStreamClosed = sal_False; + m_bInputStreamClosed = sal_False; m_pFIFO = new MemFIFO; m_conditionBytesAvail = osl_createCondition(); @@ -406,7 +406,7 @@ void OPipeImpl::setSuccessor( const Reference < XConnectable > &r ) } } -Reference < XConnectable > OPipeImpl::getSuccessor() throw( RuntimeException ) +Reference < XConnectable > OPipeImpl::getSuccessor() throw( RuntimeException ) { return m_succ; } @@ -477,7 +477,7 @@ Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance( } -OUString OPipeImpl_getImplementationName() +OUString OPipeImpl_getImplementationName() { return OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); } diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 0d20908daae1..d0b78f988551 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,17 +63,17 @@ using namespace com::sun::star::io; #include "factreg.hxx" namespace io_stm { - + class Pump : public WeakImplHelper5< XActiveDataSource, XActiveDataSink, XActiveDataControl, XConnectable, XServiceInfo > { - Mutex m_aMutex; - oslThread m_aThread; + Mutex m_aMutex; + oslThread m_aThread; - Reference< XConnectable > m_xPred; - Reference< XConnectable > m_xSucc; - Reference< XInputStream > m_xInput; - Reference< XOutputStream > m_xOutput; + Reference< XConnectable > m_xPred; + Reference< XConnectable > m_xSucc; + Reference< XInputStream > m_xInput; + Reference< XOutputStream > m_xOutput; OInterfaceContainerHelper m_cnt; sal_Bool m_closeFired; @@ -85,31 +85,31 @@ namespace io_stm { void fireStarted(); void fireTerminated(); void fireError( const Any &a ); - + public: Pump(); virtual ~Pump(); - + // XActiveDataSource virtual void SAL_CALL setOutputStream( const Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw(); virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw(); - + // XActiveDataSink virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw(); virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw(); - + // XActiveDataControl virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(); virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(); virtual void SAL_CALL start() throw( RuntimeException ); virtual void SAL_CALL terminate() throw(); - + // XConnectable virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw(); virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(); virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw(); virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(); - + public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); @@ -122,7 +122,7 @@ Pump::Pump() : m_aThread( 0 ), { g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt ); } - + Pump::~Pump() { // exit gracefully @@ -226,7 +226,7 @@ void Pump::close() MutexGuard guard( m_aMutex ); rInput = m_xInput; m_xInput.clear(); - + rOutput = m_xOutput; m_xOutput.clear(); m_xSucc.clear(); @@ -240,7 +240,7 @@ void Pump::close() } catch( Exception & ) { - // go down calm + // go down calm } } if( rOutput.is() ) @@ -276,7 +276,7 @@ void Pump::run() rInput = m_xInput; rOutput = m_xOutput; } - + if( ! rInput.is() ) { NotConnectedException exception( diff --git a/io/source/stm/stm.xml b/io/source/stm/stm.xml index 64e76dc8d2c7..cf31de6229cb 100644 --- a/io/source/stm/stm.xml +++ b/io/source/stm/stm.xml @@ -6,35 +6,35 @@ <component-description> <author> Joerg Budischewski </author> <name> com.sun.star.comp.io.stm.Pipe </name> - <description> + <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.Pipe </supported-service> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> + <status value="final"/> + <supported-service> com.sun.star.io.Pipe </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -43,30 +43,30 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> - <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.DataInputStream </supported-service> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <language> c++ </language> + <status value="final"/> + <supported-service> com.sun.star.io.DataInputStream </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -75,32 +75,32 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.DataOutputStream </supported-service> + <status value="final"/> + <supported-service> com.sun.star.io.DataOutputStream </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -109,32 +109,32 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.ObjectInputStream </supported-service> + <status value="final"/> + <supported-service> com.sun.star.io.ObjectInputStream </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -143,32 +143,32 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.ObjectOutputStream </supported-service> + <status value="final"/> + <supported-service> com.sun.star.io.ObjectOutputStream </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -177,32 +177,32 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.MarkableInputStream </supported-service> + <status value="final"/> + <supported-service> com.sun.star.io.MarkableInputStream </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -211,32 +211,32 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.MarkableOutputStream </supported-service> + <status value="final"/> + <supported-service> com.sun.star.io.MarkableOutputStream </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XObjectInputStream </type> - <type> com.sun.star.io.XObjectOutputStream </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XMarkableStream </type> - <type> com.sun.star.io.UnexpectedEOFException </type> - <type> com.sun.star.io.WrongFormatException </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.registry.XImplementationRegistration </type> - <type> com.sun.star.test.XSimpleTest </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.io.XObjectInputStream </type> + <type> com.sun.star.io.XObjectOutputStream </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XMarkableStream </type> + <type> com.sun.star.io.UnexpectedEOFException </type> + <type> com.sun.star.io.WrongFormatException </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.registry.XImplementationRegistration </type> + <type> com.sun.star.test.XSimpleTest </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> </component-description> <component-description> @@ -245,34 +245,34 @@ <description> This component provides ... </description> - <loader-name> com.sun.star.loader.SharedLibrary </loader-name> + <loader-name> com.sun.star.loader.SharedLibrary </loader-name> <language> c++ </language> - <status value="final"/> - <supported-service> com.sun.star.io.Pump </supported-service> + <status value="final"/> + <supported-service> com.sun.star.io.Pump </supported-service> <service-dependency> ... </service-dependency> - <type> com.sun.star.io.XConnectable </type> - <type> com.sun.star.io.XActiveDataSource </type> - <type> com.sun.star.io.XActiveDataSink </type> - <type> com.sun.star.io.XActiveDataControl </type> - <type> com.sun.star.lang.DisposedException </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.io.XConnectable </type> + <type> com.sun.star.io.XActiveDataSource </type> + <type> com.sun.star.io.XActiveDataSink </type> + <type> com.sun.star.io.XActiveDataControl </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.TypeClass </type> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu2 </runtime-module-dependency> - <runtime-module-dependency> sal2 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu2 </runtime-module-dependency> + <runtime-module-dependency> sal2 </runtime-module-dependency> </module-description> diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx index 8791c016db7d..c09aa22822f9 100644 --- a/io/source/stm/streamhelper.cxx +++ b/io/source/stm/streamhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,10 +90,10 @@ void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( I_FIFO_OutOfBoundsException MemRingBuffer::MemRingBuffer() { - m_nBufferLen = 0; - m_p = 0; - m_nStart = 0; - m_nOccupiedBuffer = 0; + m_nBufferLen = 0; + m_p = 0; + m_nStart = 0; + m_nOccupiedBuffer = 0; } MemRingBuffer::~MemRingBuffer() diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx index 6a792732d4ef..8481d67f6079 100644 --- a/io/source/stm/streamhelper.hxx +++ b/io/source/stm/streamhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <assert.h> #define Max( a, b ) (((a)>(b)) ? (a) : (b) ) -#define Min( a, b ) (((a)<(b)) ? (a) : (b) ) +#define Min( a, b ) (((a)<(b)) ? (a) : (b) ) namespace io_stm { @@ -55,15 +55,15 @@ class I_FIFO public: - virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException, + virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException, I_FIFO_OutOfBoundsException )=0; - virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) + virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) throw( I_FIFO_OutOfBoundsException )=0; - virtual void skip( sal_Int32 nBytesToSkip ) + virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException )=0; - virtual sal_Int32 getSize() const throw( ) =0; - virtual void shrink() throw() = 0; + virtual sal_Int32 getSize() const throw( ) =0; + virtual void shrink() throw() = 0; virtual ~I_FIFO() {}; }; @@ -86,15 +86,15 @@ public: * ***/ - virtual void writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &) + virtual void writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &) throw( IRingBuffer_OutOfMemoryException, IRingBuffer_OutOfBoundsException )=0; - virtual void readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const + virtual void readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const throw( IRingBuffer_OutOfBoundsException )=0; - virtual sal_Int32 getSize() const throw( ) =0; - virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0; - virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0; - virtual void shrink() throw() = 0; + virtual sal_Int32 getSize() const throw( ) =0; + virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0; + virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0; + virtual void shrink() throw() = 0; virtual ~IRingBuffer() {}; }; @@ -106,14 +106,14 @@ public: MemRingBuffer(); virtual ~MemRingBuffer(); - virtual void writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &) - throw( IRingBuffer_OutOfMemoryException, + virtual void writeAt( sal_Int32 nPos, const Sequence<sal_Int8> &) + throw( IRingBuffer_OutOfMemoryException, IRingBuffer_OutOfBoundsException ); - virtual void readAt( sal_Int32 nPos, Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) const + virtual void readAt( sal_Int32 nPos, Sequence<sal_Int8> & , 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); + virtual sal_Int32 getSize() const throw( ); + virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException); + virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException); virtual void shrink() throw(); @@ -129,10 +129,10 @@ private: assert( 0 == m_nStart || m_nStart < m_nBufferLen ); } - sal_Int8 *m_p; - sal_Int32 m_nBufferLen; - sal_Int32 m_nStart; - sal_Int32 m_nOccupiedBuffer; + sal_Int8 *m_p; + sal_Int32 m_nBufferLen; + sal_Int32 m_nStart; + sal_Int32 m_nOccupiedBuffer; }; @@ -141,14 +141,14 @@ class MemFIFO : private MemRingBuffer { public: - virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException, + virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException, I_FIFO_OutOfBoundsException ); - virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) + virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) throw( I_FIFO_OutOfBoundsException ); - virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException ); - virtual sal_Int32 getSize() const throw( ) + virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException ); + virtual sal_Int32 getSize() const throw( ) { return MemRingBuffer::getSize(); } - virtual void shrink() throw() + virtual void shrink() throw() { MemRingBuffer::shrink(); } }; |