INTEGRATION: CWS aw024 (1.12.20); FILE MERGED

2006/09/21 19:50:45 aw 1.12.20.6: RESYNC: (1.16-1.17); FILE MERGED
2006/08/03 15:29:14 aw 1.12.20.5: RESYNC: (1.15-1.16); FILE MERGED
2006/07/04 13:31:43 aw 1.12.20.4: RESYNC: (1.14-1.15); FILE MERGED
2006/05/12 18:54:16 aw 1.12.20.3: RESYNC: (1.13-1.14); FILE MERGED
2005/09/18 05:36:30 aw 1.12.20.2: RESYNC: (1.12-1.13); FILE MERGED
2005/08/04 15:47:25 sj 1.12.20.1: #48467# using GraphicExporter component for exports, graphic filter progress now works now via xStatusIndicater instead of callback mechanism

svx/source/xoutdev/_xoutbmp.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: _xoutbmp.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 06:22:13 $
+ *  last change: $Author: ihi $ $Date: 2006-11-14 13:55:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -482,7 +482,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
                 {
                     aURL.setExtension( aExt );
                     rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
-                    nErr = ExportGraphic( aGraphic, aURL, *pFilter, nFilter, TRUE, NULL );
+                    nErr = ExportGraphic( aGraphic, aURL, *pFilter, nFilter, NULL );
                 }
             }
         }
@@ -501,11 +501,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
 #pragma optimize ( "", off )
 #endif
 
-// SJ: bIgnoreOptions is not used anymore
-
 USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
                                   GraphicFilter& rFilter, const USHORT nFormat,
-                                  BOOL /*bIgnoreOptions*/,
                                   const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
 {
     DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
@@ -518,8 +515,7 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject&
     {
         pGrfFilter = &rFilter;
 
-        nRet = rFilter.ExportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ),
-                    *pOStm, nFormat, sal_True, pFilterData );
+        nRet = rFilter.ExportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pOStm, nFormat, pFilterData );
 
         pGrfFilter = NULL;
         aMedium.Commit();