Kaydet (Commit) 8e26545a authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS aw024 (1.48.196); FILE MERGED

2006/11/10 05:29:54 aw 1.48.196.6: RESYNC: (1.56-1.58); FILE MERGED
2006/09/22 01:47:19 aw 1.48.196.5: RESYNC: (1.55-1.56); FILE MERGED
2006/09/08 20:25:40 aw 1.48.196.4: RESYNC: (1.53-1.55); FILE MERGED
2006/05/12 21:47:54 aw 1.48.196.3: RESYNC: (1.51-1.53); FILE MERGED
2005/09/17 20:18:36 aw 1.48.196.2: RESYNC: (1.48-1.49); FILE MERGED
2005/08/04 15:54:31 sj 1.48.196.1: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism
üst 01041edc
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: ww8par4.cxx,v $ * $RCSfile: ww8par4.cxx,v $
* *
* $Revision: 1.58 $ * $Revision: 1.59 $
* *
* last change: $Author: obo $ $Date: 2006-10-13 11:11:29 $ * last change: $Author: ihi $ $Date: 2006-11-14 15:15:05 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -242,7 +242,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, ...@@ -242,7 +242,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
ASSERT( !pSt, "+OLE: Groesse von 0 ???" ); ASSERT( !pSt, "+OLE: Groesse von 0 ???" );
return false; return false;
} }
bool bOk = ReadWindowMetafile(*pSt, rWMF) ? true : false; // WMF lesen bool bOk = ReadWindowMetafile( *pSt, rWMF, NULL ) ? true : false; // WMF lesen
// *pSt >> aWMF geht nicht ohne placable Header // *pSt >> aWMF geht nicht ohne placable Header
if (!bOk || pSt->GetError() || rWMF.GetActionCount() == 0) if (!bOk || pSt->GetError() || rWMF.GetActionCount() == 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment