diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:41:41 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 14:41:41 +0000 |
| commit | 7bf03f07b6c4f9f28f4a7fab86f3d21c463a4cef (patch) | |
| tree | 6f138b8797a139019196acaa2f473ec7ee7c9496 /svtools/source | |
| parent | fe3ad218a8c4d392400777a5c8837612e0b75193 (diff) | |
INTEGRATION: CWS aw024 (1.11.24); FILE MERGED
2006/11/10 06:05:13 aw 1.11.24.7: RESYNC: (1.17-1.18); FILE MERGED
2006/09/22 05:00:59 aw 1.11.24.6: RESYNC: (1.16-1.17); FILE MERGED
2006/07/04 16:50:31 aw 1.11.24.5: RESYNC: (1.15-1.16); FILE MERGED
2006/05/12 23:10:56 aw 1.11.24.4: RESYNC: (1.14-1.15); FILE MERGED
2005/11/18 18:34:51 aw 1.11.24.3: RESYNC: (1.12-1.14); FILE MERGED
2005/09/19 19:38:41 aw 1.11.24.2: RESYNC: (1.11-1.12); FILE MERGED
2005/08/04 15:37:42 sj 1.11.24.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/emfwr.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx index 069ed669beb9..84dea24fdf83 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.cxx +++ b/svtools/source/filter.vcl/wmf/emfwr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: emfwr.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:18:59 $ + * last change: $Author: ihi $ $Date: 2006-11-14 15:41:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,8 +157,7 @@ // - EMFWriter - // ------------- -BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, - PFilterCallback pCallback, void* pCallerData ) +BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfigItem* pFilterConfigItem ) { const ULONG nHeaderPos = rOStm.Tell(); @@ -169,10 +168,9 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, mbRecordOpen = FALSE; mpStm = &rOStm; - mpCallback = pCallback; - mpCallerData = pCallerData; maVDev.EnableOutput( FALSE ); maVDev.SetMapMode( rMtf.GetPrefMapMode() ); + mpFilterConfigItem = pFilterConfigItem; const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) ); const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); |