diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:27:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:27:40 +0000 |
| commit | c19438e275572c54e4cb758675145566f1c640e8 (patch) | |
| tree | 89c3ac52e8d241f3984aa39ca6899c367d80c6fc /configmgr/source | |
| parent | f83bf73f6ec645bcad8853e220234bca237040d7 (diff) | |
INTEGRATION: CWS warnings01 (1.5.4); FILE MERGED
2005/11/09 17:43:26 pl 1.5.4.3: #i53898# resolved a merge conflict
2005/11/07 18:52:19 pl 1.5.4.2: RESYNC: (1.5-1.6); FILE MERGED
2005/11/01 12:47:27 cd 1.5.4.1: #i53898# Warning free code for sun solaris compiler
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/misc/oslstream.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configmgr/source/misc/oslstream.cxx b/configmgr/source/misc/oslstream.cxx index aff7d89d3ea0..f5164150b517 100644 --- a/configmgr/source/misc/oslstream.cxx +++ b/configmgr/source/misc/oslstream.cxx @@ -4,9 +4,9 @@ * * $RCSfile: oslstream.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-10-19 12:17:34 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:27:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,10 +99,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen - if (nRead < (sal_uInt32)nBytesToRead) - aData.realloc( nRead ); + if (nRead < (sal_uInt64)nBytesToRead) + aData.realloc( sal::static_int_cast<sal_Int32>( nRead )); - return nRead; + return sal::static_int_cast<sal_Int32>( nRead ); } //------------------------------------------------------------------------------ @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte eError = m_pFile->setPos(Pos_Absolut, nPos); if (eError != File::E_None) throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); - return nAvailable; + return sal::static_int_cast<sal_Int32>( nAvailable ); } //------------------------------------------------------------------------------ |