diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:42:51 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:42:51 +0000 |
| commit | 2190a2dbeb17a9f8bc5e47a3cd5f67de106a3c60 (patch) | |
| tree | 8e7149e1e9739a96d1d065f49abb84cb12114502 /svtools/source | |
| parent | 1a40edb65b4cb0c35bf7f48de88b0aa4586abeb0 (diff) | |
INTEGRATION: CWS aw024 (1.24.22); FILE MERGED
2006/11/10 06:05:50 aw 1.24.22.7: RESYNC: (1.30-1.32); FILE MERGED
2006/09/22 05:01:28 aw 1.24.22.6: RESYNC: (1.29-1.30); FILE MERGED
2006/07/04 16:51:00 aw 1.24.22.5: RESYNC: (1.28-1.29); FILE MERGED
2006/01/30 19:42:39 aw 1.24.22.4: RESYNC: (1.27-1.28); FILE MERGED
2005/11/18 18:35:30 aw 1.24.22.3: RESYNC: (1.25-1.27); FILE MERGED
2005/09/19 19:39:55 aw 1.24.22.2: RESYNC: (1.24-1.25); FILE MERGED
2005/08/04 15:37:43 sj 1.24.22.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/wmf/winwmf.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx index 2a3cfe7026d8..b44928fe2ba0 100644 --- a/svtools/source/filter.vcl/wmf/winwmf.cxx +++ b/svtools/source/filter.vcl/wmf/winwmf.cxx @@ -4,9 +4,9 @@ * * $RCSfile: winwmf.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:19:20 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:42:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -995,7 +995,7 @@ BOOL WMFReader::ReadHeader() return TRUE; } -void WMFReader::ReadWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, PFilterCallback pcallback, void * pcallerdata) +void WMFReader::ReadWMF() { USHORT nFunction; ULONG nPos, nPercent, nLastPercent; @@ -1027,9 +1027,7 @@ void WMFReader::ReadWMF() // SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, if( nLastPercent + 4 <= nPercent ) { - if( Callback( (USHORT) nPercent ) ) - break; - + Callback( (USHORT) nPercent ); nLastPercent = nPercent; } *pWMF >> nRecSize >> nFunction; |