diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 15:15:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 15:15:13 +0000 |
| commit | 707ee99078a5993df590083401d2525549de00e9 (patch) | |
| tree | 55e96df5f73a27a2e2a23df0d000819bf9fb50ec /goodies | |
| parent | fa0f66450493358b5296c54797ca1751e2d44ba0 (diff) | |
INTEGRATION: CWS aw024 (1.8.18); FILE MERGED
2006/11/10 06:48:40 aw 1.8.18.9: RESYNC: (1.15-1.16); FILE MERGED
2006/09/22 06:00:04 aw 1.8.18.8: RESYNC: (1.14-1.15); FILE MERGED
2006/08/03 19:39:16 aw 1.8.18.7: RESYNC: (1.13-1.14); FILE MERGED
2006/07/07 15:59:42 aw 1.8.18.6: adaptions after resync SRC680m171->SRC680m174
2006/07/04 17:46:31 aw 1.8.18.5: RESYNC: (1.12-1.13); FILE MERGED
2006/05/13 00:13:19 aw 1.8.18.4: RESYNC: (1.10-1.12); FILE MERGED
2006/01/26 23:45:06 aw 1.8.18.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/20 04:44:28 aw 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED
2005/08/04 14:47:08 sj 1.8.18.1: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/ieps/ieps.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/goodies/source/filter.vcl/ieps/ieps.cxx b/goodies/source/filter.vcl/ieps/ieps.cxx index 1a3f1249f861..3922c1e310e6 100644 --- a/goodies/source/filter.vcl/ieps/ieps.cxx +++ b/goodies/source/filter.vcl/ieps/ieps.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ieps.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:36:55 $ + * last change: $Author: ihi $ $Date: 2006-11-14 16:15:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -455,13 +455,9 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, //================== GraphicImport - die exportierte Funktion ================ #ifdef WNT -extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic, - PFilterCallback /*pCallback*/, void * /*pCallerData*/, - FilterConfigItem*, BOOL) +extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL) #else -extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic, - PFilterCallback /*pCallback*/, void * /*pCallerData*/, - FilterConfigItem*, BOOL) +extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL) #endif { if ( rStream.GetError() ) |