diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:41:01 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:41:01 +0000 |
| commit | 88aa91cd5005bbbefae18e3e4fda52c1d685953c (patch) | |
| tree | 358a657b89bc9894bcfc5ec7666add0adec2107f /svtools/source | |
| parent | 7f404f0c04ec19fa146f8a30c73cb56cb1e556f9 (diff) | |
INTEGRATION: CWS aw024 (1.2.454); FILE MERGED
2006/11/10 06:04:57 aw 1.2.454.6: RESYNC: (1.5-1.6); FILE MERGED
2006/09/22 05:00:09 aw 1.2.454.5: RESYNC: (1.4-1.5); FILE MERGED
2006/07/07 15:58:55 aw 1.2.454.4: adaptions after resync SRC680m171->SRC680m174
2006/07/04 16:50:01 aw 1.2.454.3: RESYNC: (1.3-1.4); FILE MERGED
2005/09/19 19:36:43 aw 1.2.454.2: RESYNC: (1.2-1.3); FILE MERGED
2005/08/04 15:37:41 sj 1.2.454.1: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/filter.vcl/ixbm/xbmread.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter.vcl/ixbm/xbmread.cxx index 12c683166c26..6bef34685298 100644 --- a/svtools/source/filter.vcl/ixbm/xbmread.cxx +++ b/svtools/source/filter.vcl/ixbm/xbmread.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xbmread.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:18:46 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:41:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,7 +46,7 @@ // - XBMReader - // ------------- -XBMReader::XBMReader( SvStream& rStm, void* ) : +XBMReader::XBMReader( SvStream& rStm ) : rIStm ( rStm ), pAcc1 ( NULL ), nLastPos ( rStm.Tell() ), @@ -380,14 +380,14 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) // - ImportXBM - // ------------- -BOOL ImportXBM( SvStream& rStm, Graphic& rGraphic, void* pCallerData ) +BOOL ImportXBM( SvStream& rStm, Graphic& rGraphic ) { XBMReader* pXBMReader = (XBMReader*) rGraphic.GetContext(); ReadState eReadState; BOOL bRet = TRUE; if( !pXBMReader ) - pXBMReader = new XBMReader( rStm, pCallerData ); + pXBMReader = new XBMReader( rStm ); rGraphic.SetContext( NULL ); eReadState = pXBMReader->ReadXBM( rGraphic ); |