diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:19:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:19:51 +0000 |
| commit | 1fa173d06c51f750ee05259a7b12e576a7eb0abf (patch) | |
| tree | 9eed9e5aa2850f647f91fd57a262f1b8e4e21ed0 /package | |
| parent | b2b68561d1f94a9d4980e36eee02f9945649b7fc (diff) | |
INTEGRATION: CWS fwk88 (1.13.8); FILE MERGED
2008/05/27 15:57:23 mav 1.13.8.1: #i86348# integrate the patch
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/ByteChucker.hxx | 10 | ||||
| -rw-r--r-- | package/source/zipapi/CRC32.cxx | 11 |
2 files changed, 2 insertions, 19 deletions
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index 13d7f2f219e3..35c127db3db3 100644 --- a/package/inc/ByteChucker.hxx +++ b/package/inc/ByteChucker.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ByteChucker.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This file is part of OpenOffice.org. * @@ -56,17 +56,9 @@ public: // XOutputStream void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nLength = -1, const sal_Int8 * const pData = NULL) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL flush( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL closeOutput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XSeekable - sal_Int64 SAL_CALL seek( sal_Int64 location ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); sal_Int64 SAL_CALL getPosition( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int64 SAL_CALL getLength( ) - throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); ByteChucker& operator << (sal_Int8 nInt8); ByteChucker& operator << (sal_Int16 nInt16); diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx index 6626e890ed88..080f90b9db50 100644 --- a/package/source/zipapi/CRC32.cxx +++ b/package/source/zipapi/CRC32.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CRC32.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This file is part of OpenOffice.org. * @@ -65,15 +65,6 @@ sal_Int32 SAL_CALL CRC32::getValue() { return nCRC & 0xFFFFFFFFL; } -/** Update CRC32 with specified byte - */ -void SAL_CALL CRC32::updateByte (sal_Int8 nByte) - throw(RuntimeException) -{ - sal_uInt8 pBuf[1]; - pBuf[0] = (sal_uInt8)nByte; - nCRC = crc32(nCRC, pBuf, 1); -} /** Update CRC32 with specified sequence of bytes */ void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b, |