Index: inc/ByteChucker.hxx =================================================================== RCS file: /cvs/xml/package/inc/ByteChucker.hxx,v --- inc/ByteChucker.hxx 8 Sep 2005 15:54:18 -0000 1.12 +++ inc/ByteChucker.hxx 22 Feb 2008 10:29:10 -0000 @@ -75,17 +75,9 @@ // 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); Index: inc/ByteGrabber.hxx =================================================================== RCS file: /cvs/xml/package/inc/ByteGrabber.hxx,v --- inc/ByteGrabber.hxx 8 Sep 2005 15:54:33 -0000 1.10 +++ inc/ByteGrabber.hxx 22 Feb 2008 10:29:10 -0000 @@ -76,14 +76,6 @@ // XInputStream sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::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); Index: inc/CRC32.hxx =================================================================== RCS file: /cvs/xml/package/inc/CRC32.hxx,v --- inc/CRC32.hxx 8 Sep 2005 15:54:49 -0000 1.11 +++ inc/CRC32.hxx 22 Feb 2008 10:29:11 -0000 @@ -55,8 +55,6 @@ sal_Int32 SAL_CALL updateStream (::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > & xStream) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL updateByte (sal_Int8 nByte) - throw(::com::sun::star::uno::RuntimeException); void SAL_CALL updateSegment(const ::com::sun::star::uno::Sequence< sal_Int8 > &b, sal_Int32 off, sal_Int32 len) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL update(const ::com::sun::star::uno::Sequence< sal_Int8 > &b) Index: inc/Deflater.hxx =================================================================== RCS file: /cvs/xml/package/inc/Deflater.hxx,v --- inc/Deflater.hxx 20 Jun 2006 06:09:36 -0000 1.10 +++ inc/Deflater.hxx 22 Feb 2008 10:29:11 -0000 @@ -59,22 +59,14 @@ sal_Int32 doDeflateBytes (com::sun::star::uno::Sequence < sal_Int8 > &rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength); public: - Deflater(); ~Deflater(); - Deflater(sal_Int32 nSetLevel); Deflater(sal_Int32 nSetLevel, sal_Bool bNowrap); void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - void SAL_CALL setDictionarySegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - void SAL_CALL setDictionary( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - void SAL_CALL setStrategy( sal_Int32 nNewStrategy ); void SAL_CALL setLevel( sal_Int32 nNewLevel ); sal_Bool SAL_CALL needsInput( ); void SAL_CALL finish( ); sal_Bool SAL_CALL finished( ); sal_Int32 SAL_CALL doDeflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - sal_Int32 SAL_CALL doDeflate( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - sal_Int32 SAL_CALL getAdler( ); sal_Int32 SAL_CALL getTotalIn( ); sal_Int32 SAL_CALL getTotalOut( ); void SAL_CALL reset( ); Index: inc/Inflater.hxx =================================================================== RCS file: /cvs/xml/package/inc/Inflater.hxx,v --- inc/Inflater.hxx 8 Sep 2005 15:56:46 -0000 1.11 +++ inc/Inflater.hxx 22 Feb 2008 10:29:19 -0000 @@ -55,21 +55,10 @@ public: Inflater(sal_Bool bNoWrap = sal_False); ~Inflater(); - void SAL_CALL setInputSegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); void SAL_CALL setInput( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - void SAL_CALL setDictionarySegment( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - void SAL_CALL setDictionary( const ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - sal_Int32 SAL_CALL getRemaining( ); - sal_Bool SAL_CALL needsInput( ); sal_Bool SAL_CALL needsDictionary( ); - void SAL_CALL finish( ); sal_Bool SAL_CALL finished( ); sal_Int32 SAL_CALL doInflateSegment( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - sal_Int32 SAL_CALL doInflate( ::com::sun::star::uno::Sequence< sal_Int8 >& rBuffer ); - sal_Int32 SAL_CALL getAdler( ); - sal_Int32 SAL_CALL getTotalIn( ); - sal_Int32 SAL_CALL getTotalOut( ); - void SAL_CALL reset( ); void SAL_CALL end( ); }; Index: inc/ZipFile.hxx =================================================================== RCS file: /cvs/xml/package/inc/ZipFile.hxx,v --- inc/ZipFile.hxx 6 Oct 2006 10:48:53 -0000 1.22 +++ inc/ZipFile.hxx 22 Feb 2008 10:29:29 -0000 @@ -197,11 +197,6 @@ ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException ); - ::rtl::OUString SAL_CALL getName( ) - throw(::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSize( ) - throw(::com::sun::star::uno::RuntimeException); - ZipEnumeration * SAL_CALL entries( ); protected: sal_Bool readLOC ( ZipEntry &rEntry) Index: inc/ZipOutputStream.hxx =================================================================== RCS file: /cvs/xml/package/inc/ZipOutputStream.hxx,v --- inc/ZipOutputStream.hxx 8 Sep 2005 15:59:00 -0000 1.23 +++ inc/ZipOutputStream.hxx 22 Feb 2008 10:29:29 -0000 @@ -87,8 +87,6 @@ throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XZipOutputStream interfaces - void SAL_CALL setComment( const ::rtl::OUString& rComment ) - throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setMethod( sal_Int32 nNewMethod ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setLevel( sal_Int32 nNewLevel ) @@ -103,8 +101,6 @@ throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); void SAL_CALL finish( ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL close( ) - throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); static sal_uInt32 getCurrentDosTime ( ); protected: void doDeflate(); Index: inc/ZipPackageBuffer.hxx =================================================================== RCS file: /cvs/xml/package/inc/ZipPackageBuffer.hxx,v --- inc/ZipPackageBuffer.hxx 8 Sep 2005 15:59:39 -0000 1.16 +++ inc/ZipPackageBuffer.hxx 22 Feb 2008 10:29:30 -0000 @@ -63,7 +63,6 @@ sal_Bool m_bMustInitBuffer; public: ZipPackageBuffer(sal_Int64 nNewBufferSize); - ZipPackageBuffer( com::sun::star::uno::Sequence < sal_Int8 > &nNewBuffer ); virtual ~ZipPackageBuffer(void); inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); } Index: source/xstor/ocompinstream.cxx =================================================================== RCS file: /cvs/xml/package/source/xstor/ocompinstream.cxx,v --- source/xstor/ocompinstream.cxx 26 Mar 2007 12:13:44 -0000 1.10 +++ source/xstor/ocompinstream.cxx 22 Feb 2008 10:31:01 -0000 @@ -52,29 +52,6 @@ using namespace ::com::sun::star; //----------------------------------------------- -OInputCompStream::OInputCompStream( sal_Int16 nStorageType ) -: m_pImpl( NULL ) -, m_rMutexRef( new SotMutexHolder ) -, m_pInterfaceContainer( NULL ) -, m_bDisposed( sal_False ) -, m_nStorageType( nStorageType ) -{ -} - -//----------------------------------------------- -OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl, sal_Int16 nStorageType ) -: m_pImpl( &aImpl ) -, m_rMutexRef( m_pImpl->m_rMutexRef ) -, m_pInterfaceContainer( NULL ) -, m_bDisposed( sal_False ) -, m_nStorageType( nStorageType ) -{ - OSL_ENSURE( m_pImpl->m_rMutexRef.Is(), "No mutex is provided!\n" ); - if ( !m_pImpl->m_rMutexRef.Is() ) - throw uno::RuntimeException(); // just a disaster -} - -//----------------------------------------------- OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl, uno::Reference < io::XInputStream > xStream, const uno::Sequence< beans::PropertyValue >& aProps, Index: source/xstor/ocompinstream.hxx =================================================================== RCS file: /cvs/xml/package/source/xstor/ocompinstream.hxx,v --- source/xstor/ocompinstream.hxx 13 Oct 2006 11:49:01 -0000 1.5 +++ source/xstor/ocompinstream.hxx 22 Feb 2008 10:31:06 -0000 @@ -96,9 +96,6 @@ sal_Int16 m_nStorageType; - OInputCompStream( sal_Int16 nStorageType ); - OInputCompStream( OWriteStream_Impl& pImpl, sal_Int16 nStorageType ); - public: OInputCompStream( OWriteStream_Impl& pImpl, ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream, Index: source/xstor/oseekinstream.cxx =================================================================== RCS file: /cvs/xml/package/source/xstor/oseekinstream.cxx,v --- source/xstor/oseekinstream.cxx 13 Oct 2006 11:49:39 -0000 1.6 +++ source/xstor/oseekinstream.cxx 22 Feb 2008 10:31:06 -0000 @@ -54,26 +54,6 @@ using namespace ::com::sun::star; OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl, - uno::Reference < io::XStream > xStream, - const uno::Sequence< beans::PropertyValue >& aProps, - sal_Int16 nStorageType ) -: OInputCompStream( pImpl, nStorageType ) -{ - OSL_ENSURE( xStream.is(), "No stream is provided!\n" ); - - if ( xStream.is() ) - { - m_xStream = xStream->getInputStream(); - m_xSeekable = uno::Reference< io::XSeekable >( xStream, uno::UNO_QUERY ); - - OSL_ENSURE( m_xStream.is(), "No input stream is provided!\n" ); - OSL_ENSURE( m_xSeekable.is(), "No seeking support!\n" ); - } - - m_aProperties = aProps; -} - -OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl, uno::Reference < io::XInputStream > xStream, const uno::Sequence< beans::PropertyValue >& aProps, sal_Int16 nStorageType ) @@ -86,25 +66,6 @@ } } -OInputSeekStream::OInputSeekStream( uno::Reference < io::XStream > xStream, - const uno::Sequence< beans::PropertyValue >& aProps, - sal_Int16 nStorageType ) -: OInputCompStream( nStorageType ) -{ - OSL_ENSURE( xStream.is(), "No stream is provided!\n" ); - - if ( xStream.is() ) - { - m_xStream = xStream->getInputStream(); - m_xSeekable = uno::Reference< io::XSeekable >( xStream, uno::UNO_QUERY ); - - OSL_ENSURE( m_xStream.is(), "No input stream is provided!\n" ); - OSL_ENSURE( m_xSeekable.is(), "No seeking support!\n" ); - } - - m_aProperties = aProps; -} - OInputSeekStream::OInputSeekStream( uno::Reference < io::XInputStream > xStream, const uno::Sequence< beans::PropertyValue >& aProps, sal_Int16 nStorageType ) Index: source/xstor/oseekinstream.hxx =================================================================== RCS file: /cvs/xml/package/source/xstor/oseekinstream.hxx,v --- source/xstor/oseekinstream.hxx 13 Oct 2006 11:49:55 -0000 1.5 +++ source/xstor/oseekinstream.hxx 22 Feb 2008 10:31:06 -0000 @@ -54,19 +54,10 @@ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, sal_Int16 nStorageType ); - OInputSeekStream( OWriteStream_Impl& pImpl, - ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, - sal_Int16 nStorageType ); - OInputSeekStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, sal_Int16 nStorageType ); - OInputSeekStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps, - sal_Int16 nStorageType ); - virtual ~OInputSeekStream(); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); Index: source/zipapi/Adler32.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/Adler32.cxx,v --- source/zipapi/Adler32.cxx 17 Sep 2006 17:25:47 -0000 1.7 +++ source/zipapi/Adler32.cxx 22 Feb 2008 10:32:05 -0000 @@ -1,99 +1, @@ -/************************************************************************* - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile$ - * - * $Revision$ - * - * last change: $Author$ $Date$ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. - * - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_package.hxx" -#ifndef _ADLER32_HXX -#include -#endif -#ifndef _ZLIB_H -#ifdef SYSTEM_ZLIB -#include -#else -#include -#endif -#endif - -/** - * A class that can be used to compute the Adler-32 checksum of a data - * stream. An Adler-32 checksum is almost as reliable as a CRC-32 but - * can be computed much faster. - * - */ - -using namespace rtl; -using namespace com::sun::star; - -Adler32::Adler32() : nAdler(1) -{ -} - -Adler32::~Adler32() -{ -} -/** Updates checksum with specified byte - */ -void SAL_CALL Adler32::updateByte (sal_Int8 nByte) -{ - sal_uInt8 pBuf[1]; - pBuf[0] = (sal_uInt8)nByte; - nAdler = adler32(nAdler, pBuf, 1); -} -/** Updates checksum with specified sequence of bytes - */ -void SAL_CALL Adler32::updateSegment(const uno::Sequence< sal_Int8 > &b, - sal_Int32 off, - sal_Int32 len) -{ - nAdler = adler32(nAdler, (const unsigned char*)b.getConstArray()+off, len ); -} -/** Updates checksum with specified sequence of bytes - */ -void SAL_CALL Adler32::update(const uno::Sequence< sal_Int8 > &b) -{ - nAdler = adler32(nAdler, (const unsigned char*)b.getConstArray(),b.getLength()); -} -/** Returns checksum value. - */ -sal_Int32 SAL_CALL Adler32::getValue() -{ - return (sal_Int32) nAdler & 0xFFFFFFFFL; -} -/** Resets checksum to initial value. - */ -void SAL_CALL Adler32::reset() -{ - nAdler = 1; -} Index: source/zipapi/Adler32.hxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/Adler32.hxx,v --- source/zipapi/Adler32.hxx 8 Sep 2005 16:10:25 -0000 1.4 +++ source/zipapi/Adler32.hxx 22 Feb 2008 10:32:05 -0000 @@ -1,56 +1, @@ -/************************************************************************* - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile$ - * - * $Revision$ - * - * last change: $Author$ $Date$ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. - * - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - ************************************************************************/ -#ifndef _ADLER32_HXX -#define _ADLER32_HXX -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ -#include -#endif - -class Adler32 -{ -private: - sal_uInt32 nAdler; -public: - Adler32(); - ~Adler32(); - void SAL_CALL updateByte (sal_Int8 nByte); - void SAL_CALL updateSegment(const ::com::sun::star::uno::Sequence< sal_Int8 > &b, sal_Int32 off, sal_Int32 len); - void SAL_CALL update(const ::com::sun::star::uno::Sequence< sal_Int8 > &b); - sal_Int32 SAL_CALL getValue(); - void SAL_CALL reset(); -}; - -#endif Index: source/zipapi/ByteChucker.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/ByteChucker.cxx,v --- source/zipapi/ByteChucker.cxx 17 Sep 2006 17:26:00 -0000 1.20 +++ source/zipapi/ByteChucker.cxx 22 Feb 2008 10:32:09 -0000 @@ -74,39 +74,13 @@ { xStream->writeBytes(aData); } -void SAL_CALL ByteChucker::flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) -{ - xStream->flush(); -} -void SAL_CALL ByteChucker::closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) -{ - xStream->closeOutput(); -} // XSeekable chained... -sal_Int64 SAL_CALL ByteChucker::seek( sal_Int64 location ) - throw(IllegalArgumentException, IOException, RuntimeException) -{ - sal_Int64 nLen = xSeek->getLength(); - if ( location < 0 || location > nLen ) - throw IllegalArgumentException(); - if (location > nLen ) - location = nLen; - xSeek->seek( location ); - return location; -} sal_Int64 SAL_CALL ByteChucker::getPosition( ) throw(IOException, RuntimeException) { return xSeek->getPosition(); } -sal_Int64 SAL_CALL ByteChucker::getLength( ) - throw(IOException, RuntimeException) -{ - return xSeek->getLength(); -} ByteChucker& ByteChucker::operator << (sal_Int8 nInt8) { Index: source/zipapi/ByteGrabber.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/ByteGrabber.cxx,v --- source/zipapi/ByteGrabber.cxx 17 Sep 2006 17:26:15 -0000 1.14 +++ source/zipapi/ByteGrabber.cxx 22 Feb 2008 10:32:09 -0000 @@ -75,27 +75,6 @@ { return xStream->readBytes(aData, nBytesToRead ); } -sal_Int32 SAL_CALL ByteGrabber::readSomeBytes( uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw(io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) -{ - return xStream->readSomeBytes( aData, nMaxBytesToRead ); -} -void SAL_CALL ByteGrabber::skipBytes( sal_Int32 nBytesToSkip ) - throw(io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) -{ - xStream->skipBytes( nBytesToSkip ); -} -sal_Int32 SAL_CALL ByteGrabber::available( ) - throw(io::NotConnectedException, io::IOException, uno::RuntimeException) -{ - return xStream->available(); -} -void SAL_CALL ByteGrabber::closeInput( ) - throw(io::NotConnectedException, io::IOException, uno::RuntimeException) -{ - xStream->closeInput(); -} // XSeekable chained... sal_Int64 SAL_CALL ByteGrabber::seek( sal_Int64 location ) Index: source/zipapi/CRC32.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/CRC32.cxx,v --- source/zipapi/CRC32.cxx 17 Sep 2006 17:26:29 -0000 1.12 +++ source/zipapi/CRC32.cxx 22 Feb 2008 10:32:09 -0000 @@ -76,15 +76,6 @@ { 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, Index: source/zipapi/Deflater.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/Deflater.cxx,v --- source/zipapi/Deflater.cxx 17 Sep 2006 17:26:42 -0000 1.15 +++ source/zipapi/Deflater.cxx 22 Feb 2008 10:32:09 -0000 @@ -83,30 +83,6 @@ } } -Deflater::Deflater() -: bFinish(sal_False) -, bFinished(sal_False) -, bSetParams(sal_False) -, nLevel(DEFAULT_COMPRESSION) -, nStrategy(DEFAULT_STRATEGY) -, nOffset(0) -, nLength(0) -{ - init(DEFAULT_COMPRESSION, DEFAULT_STRATEGY, sal_False); -} - -Deflater::Deflater(sal_Int32 nSetLevel) -: bFinish(sal_False) -, bFinished(sal_False) -, bSetParams(sal_False) -, nLevel(nSetLevel) -, nStrategy(DEFAULT_STRATEGY) -, nOffset(0) -, nLength(0) -{ - init(nSetLevel, DEFAULT_STRATEGY, sal_False); -} - Deflater::Deflater(sal_Int32 nSetLevel, sal_Bool bNowrap) : bFinish(sal_False) , bFinished(sal_False) @@ -185,54 +161,6 @@ nOffset = nNewOffset; nLength = nNewLength; } -void SAL_CALL Deflater::setInput( const uno::Sequence< sal_Int8 >& rBuffer ) -{ - sInBuffer = rBuffer; - nOffset = 0; - nLength = rBuffer.getLength(); -} -void SAL_CALL Deflater::setDictionarySegment( const uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) -{ - if (pStream == NULL) - { - // do error handling - } - if (nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()) - { - // do error handling - } -#ifdef SYSTEM_ZLIB - deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray()+nOffset, nLength); -#else - z_deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray()+nOffset, nLength); -#endif -} -void SAL_CALL Deflater::setDictionary( const uno::Sequence< sal_Int8 >& rBuffer ) -{ - if (pStream == NULL) - { - // do error handling - } -#ifdef SYSTEM_ZLIB - deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), rBuffer.getLength()); -#else - z_deflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), rBuffer.getLength()); -#endif -} -void SAL_CALL Deflater::setStrategy( sal_Int32 nNewStrategy ) -{ - if (nNewStrategy != DEFAULT_STRATEGY && - nNewStrategy != FILTERED && - nNewStrategy != HUFFMAN_ONLY) - { - // do error handling - } - if (nStrategy != nNewStrategy) - { - nStrategy = nNewStrategy; - bSetParams = sal_True; - } -} void SAL_CALL Deflater::setLevel( sal_Int32 nNewLevel ) { if ((nNewLevel < 0 || nNewLevel > 9) && nNewLevel != DEFAULT_COMPRESSION) @@ -262,15 +190,6 @@ OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())); return doDeflateBytes(rBuffer, nNewOffset, nNewLength); } -sal_Int32 SAL_CALL Deflater::doDeflate( uno::Sequence< sal_Int8 >& rBuffer ) -{ - return doDeflateBytes(rBuffer, 0, rBuffer.getLength()); -} - -sal_Int32 SAL_CALL Deflater::getAdler( ) -{ - return pStream->adler; -} sal_Int32 SAL_CALL Deflater::getTotalIn( ) { return pStream->total_in; Index: source/zipapi/Inflater.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/Inflater.cxx,v --- source/zipapi/Inflater.cxx 17 Sep 2006 17:27:09 -0000 1.14 +++ source/zipapi/Inflater.cxx 22 Feb 2008 10:32:09 -0000 @@ -84,12 +84,6 @@ { end(); } -void SAL_CALL Inflater::setInputSegment( const Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) -{ - sInBuffer = rBuffer; - nOffset = nNewOffset; - nLength = nNewLength; -} void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) { @@ -98,59 +92,11 @@ nLength = rBuffer.getLength(); } -void SAL_CALL Inflater::setDictionarySegment( const Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) -{ - if (pStream == NULL) - { - // do error handling - } - if (nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()) - { - // do error handling - } -#ifdef SYSTEM_ZLIB - inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray() + nNewOffset, - nNewLength); -#else - z_inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray() + nNewOffset, - nNewLength); -#endif -} - -void SAL_CALL Inflater::setDictionary( const Sequence< sal_Int8 >& rBuffer ) -{ - if (pStream == NULL) - { - // do error handling - } -#ifdef SYSTEM_ZLIB - inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), - rBuffer.getLength()); -#else - z_inflateSetDictionary(pStream, (const unsigned char*)rBuffer.getConstArray(), - rBuffer.getLength()); -#endif -} - -sal_Int32 SAL_CALL Inflater::getRemaining( ) -{ - return nLength; -} - -sal_Bool SAL_CALL Inflater::needsInput( ) -{ - return nLength <=0; -} - sal_Bool SAL_CALL Inflater::needsDictionary( ) { return bNeedDict; } -void SAL_CALL Inflater::finish( ) -{ - bFinish = sal_True; -} sal_Bool SAL_CALL Inflater::finished( ) { return bFinished; @@ -165,37 +111,6 @@ return doInflateBytes(rBuffer, nNewOffset, nNewLength); } -sal_Int32 SAL_CALL Inflater::doInflate( Sequence< sal_Int8 >& rBuffer ) -{ - return doInflateBytes(rBuffer, 0, rBuffer.getLength()); -} - -sal_Int32 SAL_CALL Inflater::getAdler( ) -{ - return pStream->adler; -} - -sal_Int32 SAL_CALL Inflater::getTotalIn( ) -{ - return pStream->total_in; -} - -sal_Int32 SAL_CALL Inflater::getTotalOut( ) -{ - return pStream->total_out; -} - -void SAL_CALL Inflater::reset( ) -{ -#ifdef SYSTEM_ZLIB - inflateReset(pStream); -#else - z_inflateReset(pStream); -#endif - bFinish = bNeedDict = bFinished = sal_False; - nOffset = nLength = 0; -} - void SAL_CALL Inflater::end( ) { if (pStream != NULL) Index: source/zipapi/ZipFile.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/ZipFile.cxx,v --- source/zipapi/ZipFile.cxx 2 Nov 2007 11:48:49 -0000 1.47 +++ source/zipapi/ZipFile.cxx 22 Feb 2008 10:32:20 -0000 @@ -533,18 +533,6 @@ return new ZipEnumeration ( aEntries ); } -::rtl::OUString SAL_CALL ZipFile::getName( ) - throw(RuntimeException) -{ - return sName; -} - -sal_Int32 SAL_CALL ZipFile::getSize( ) - throw(RuntimeException) -{ - return aEntries.size(); -} - Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntry, const vos::ORef < EncryptionData > &rData, sal_Bool bIsEncrypted ) Index: source/zipapi/ZipOutputStream.cxx =================================================================== RCS file: /cvs/xml/package/source/zipapi/ZipOutputStream.cxx,v --- source/zipapi/ZipOutputStream.cxx 17 Sep 2006 17:28:29 -0000 1.39 +++ source/zipapi/ZipOutputStream.cxx 22 Feb 2008 10:32:22 -0000 @@ -92,11 +92,6 @@ delete aZipList[i]; } -void SAL_CALL ZipOutputStream::setComment( const ::rtl::OUString& rComment ) - throw(RuntimeException) -{ - sComment = rComment; -} void SAL_CALL ZipOutputStream::setMethod( sal_Int32 nNewMethod ) throw(RuntimeException) { @@ -149,11 +144,6 @@ aZipList.push_back( &rEntry ); pCurrentEntry = &rEntry; } -void SAL_CALL ZipOutputStream::close( ) - throw(IOException, RuntimeException) -{ - finish(); -} void SAL_CALL ZipOutputStream::closeEntry( ) throw(IOException, RuntimeException) Index: source/zipapi/makefile.mk =================================================================== RCS file: /cvs/xml/package/source/zipapi/makefile.mk,v --- source/zipapi/makefile.mk 24 May 2006 14:36:12 -0000 1.17 +++ source/zipapi/makefile.mk 22 Feb 2008 10:32:22 -0000 @@ -49,7 +49,6 @@ CFLAGS+=-DSYSTEM_ZLIB .ENDIF SLOFILES= \ - $(SLO)$/Adler32.obj \ $(SLO)$/CRC32.obj \ $(SLO)$/ByteChucker.obj \ $(SLO)$/ByteGrabber.obj \ Index: source/zippackage/ZipPackageBuffer.cxx =================================================================== RCS file: /cvs/xml/package/source/zippackage/ZipPackageBuffer.cxx,v --- source/zippackage/ZipPackageBuffer.cxx 17 Sep 2006 17:28:56 -0000 1.16 +++ source/zippackage/ZipPackageBuffer.cxx 22 Feb 2008 10:32:32 -0000 @@ -52,13 +52,6 @@ , m_bMustInitBuffer ( sal_True ) { } -ZipPackageBuffer::ZipPackageBuffer(Sequence < sal_Int8 > &nNewBuffer ) -: m_aBuffer ( nNewBuffer ) -, m_nEnd ( nNewBuffer.getLength() ) -, m_nCurrent( 0 ) -, m_bMustInitBuffer ( sal_False ) -{ -} ZipPackageBuffer::~ZipPackageBuffer(void) { }