From 30bdc6be69210197a2b4e497242c6d3bb7f5a785 Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Fri, 20 Jun 2008 06:16:29 +0000 Subject: INTEGRATION: CWS fwk88 (1.12.8); FILE MERGED 2008/05/27 15:57:23 mav 1.12.8.1: #i86348# integrate the patch --- package/inc/CRC32.hxx | 4 +--- package/inc/Inflater.hxx | 13 +------------ 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'package/inc') diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index d6eb4aede2ae..ae55a1e8fcf1 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: CRC32.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -46,8 +46,6 @@ public: 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) diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx index d613a9da4b10..7520ba672058 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/Inflater.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Inflater.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -48,21 +48,10 @@ protected: 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( ); }; -- cgit