diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:40:47 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:40:47 +0000 |
| commit | 7f404f0c04ec19fa146f8a30c73cb56cb1e556f9 (patch) | |
| tree | 0a9c66df695716c55d1dad30f7316fc5ce50c9be /svtools | |
| parent | 653dec0cb088d92a6e9fb42f831032ba7c6a74ba (diff) | |
INTEGRATION: CWS aw024 (1.3.454); FILE MERGED
2006/09/22 04:59:57 aw 1.3.454.5: RESYNC: (1.5-1.6); FILE MERGED
2006/07/07 15:58:55 aw 1.3.454.4: adaptions after resync SRC680m171->SRC680m174
2006/07/04 16:49:55 aw 1.3.454.3: RESYNC: (1.4-1.5); FILE MERGED
2005/09/19 19:35:59 aw 1.3.454.2: RESYNC: (1.3-1.4); FILE MERGED
2005/08/04 15:37:40 sj 1.3.454.1: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/igif/gifread.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter.vcl/igif/gifread.cxx index c646ca83d07d..45e4bfdd9f50 100644 --- a/svtools/source/filter.vcl/igif/gifread.cxx +++ b/svtools/source/filter.vcl/igif/gifread.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gifread.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 14:54:02 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:40:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,7 @@ // - GIFReader - // ------------- -GIFReader::GIFReader( SvStream& rStm, void* ) : +GIFReader::GIFReader( SvStream& rStm ) : aGPalette ( 256 ), aLPalette ( 256 ), rIStm ( rStm ), @@ -832,7 +832,7 @@ ReadState GIFReader::ReadGIF( Graphic& rGraphic ) // - ImportGIF - // ------------- -BOOL ImportGIF( SvStream & rStm, Graphic& rGraphic, void* pCallerData ) +BOOL ImportGIF( SvStream & rStm, Graphic& rGraphic ) { GIFReader* pGIFReader = (GIFReader*) rGraphic.GetContext(); USHORT nOldFormat = rStm.GetNumberFormatInt(); @@ -842,7 +842,7 @@ BOOL ImportGIF( SvStream & rStm, Graphic& rGraphic, void* pCallerData ) rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); if( !pGIFReader ) - pGIFReader = new GIFReader( rStm, pCallerData ); + pGIFReader = new GIFReader( rStm ); rGraphic.SetContext( NULL ); eReadState = pGIFReader->ReadGIF( rGraphic ); |