diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:15:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 23:15:31 +0000 |
| commit | 8373e613c0dd3ef854b5b998279ea669bec53166 (patch) | |
| tree | 47e1071ed831b99964331cc91eaca8123ce00d36 /io/source/TextInputStream | |
| parent | 9570b4c2852b1cc4e24dc2aa4ca1cc3ba1bc535a (diff) | |
INTEGRATION: CWS warnings01 (1.11.8); FILE MERGED
2005/09/22 20:25:48 sb 1.11.8.3: RESYNC: (1.11-1.12); FILE MERGED
2005/09/07 14:14:48 sb 1.11.8.2: #i53898# Made code warning-free.
2005/09/01 08:14:26 sb 1.11.8.1: #i53898# Made code warning-free.
Diffstat (limited to 'io/source/TextInputStream')
| -rw-r--r-- | io/source/TextInputStream/TextInputStream.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 7a2c59fb6b04..8fda637682d8 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TextInputStream.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:26:08 $ + * last change: $Author: hr $ $Date: 2006-06-20 00:15:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,7 +176,7 @@ OUString OTextInputStream::readLine( ) return implReadString( aDummySeq, sal_True, sal_True ); } -OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter ) +OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool ) throw(IOException, RuntimeException) { return implReadString( Delimiters, sal_True, sal_False ); @@ -349,7 +349,7 @@ sal_Int32 OTextInputStream::implReadNext() { // read next byte static Sequence< sal_Int8 > aOneByteSeq( 1 ); - sal_Int32 nRead = mxStream->readSomeBytes( aOneByteSeq, 1 ); + nRead = mxStream->readSomeBytes( aOneByteSeq, 1 ); if( nRead == 0 ) { mbReachedEOF = sal_True; @@ -375,15 +375,13 @@ sal_Int32 OTextInputStream::implReadNext() mnCharsInBuffer += nTargetCount; return nTargetCount; } - catch( NotConnectedException& e1 ) + catch( NotConnectedException& ) { - e1; throw IOException(); //throw IOException( L"OTextInputStream::implReadString failed" ); } - catch( BufferSizeExceededException& e2 ) + catch( BufferSizeExceededException& ) { - e2; throw IOException(); } } @@ -523,7 +521,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) //================================================================================================== void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) + const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } |