diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:17:52 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-20 06:17:52 +0000 |
commit | 11d16dcf4c6ea5b1f3b38d4fbf75c72ec8eef632 (patch) | |
tree | d6051657cde5943e3a380eadbc21735a860dc259 /package/inc | |
parent | 899e1d49652c8bb7e297b0e8e887398f715f77d1 (diff) |
INTEGRATION: CWS fwk88 (1.11.8); FILE MERGED
2008/05/27 15:57:23 mav 1.11.8.1: #i86348# integrate the patch
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/ByteGrabber.hxx | 10 | ||||
-rw-r--r-- | package/inc/Deflater.hxx | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 399d730ce697..725b2819f371 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ByteGrabber.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -57,14 +57,6 @@ public: // 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); diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index edfb85e86a06..187f0a4d826c 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Deflater.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -52,22 +52,14 @@ protected: 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( ); |