api changes, GraphicFilter now using Configuration Management

12 files changed, 74 insertions, 74 deletions

diff --git a/goodies/source/filter.vcl/eras/eras.cxx b/goodies/source/filter.vcl/eras/eras.cxx
index 4b5ff0867c5c..a0a5de98c119 100644
--- a/goodies/source/filter.vcl/eras/eras.cxx
+++ b/goodies/source/filter.vcl/eras/eras.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: eras.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:13 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:41:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,8 +95,8 @@ public:
                         ~RASWriter();
 
     BOOL                WriteRAS( const Graphic& rGraphic, SvStream& rRAS,
-                                  PFilterCallback pCallback, void* pCallerdata,
-                                  Config* pOptionsConfig );
+                            PFilterCallback pCallback, void* pCallerdata,
+                                FilterConfigItem* pConfigItem );
 };
 
 //=================== Methoden von RASWriter ==============================
@@ -132,8 +132,8 @@ BOOL RASWriter::ImplCallback( ULONG nYPos )
 //  ------------------------------------------------------------------------
 
 BOOL RASWriter::WriteRAS( const Graphic& rGraphic, SvStream& rRAS,
-                          PFilterCallback pCallback, void* pCallerdata,
-                          Config* pOptionsConfig )
+                            PFilterCallback pCallback, void* pCallerdata,
+                                FilterConfigItem* pConfigItem )
 {
     Bitmap  aBmp;
 
@@ -308,11 +308,11 @@ void RASWriter::ImplPutByte( BYTE nPutThis )
 
 extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic,
                                                PFilterCallback pCallback, void* pCallerData,
-                                               Config* pOptionsConfig, BOOL )
+                                               FilterConfigItem* pConfigItem, BOOL )
 {
     RASWriter aRASWriter;
 
-    return aRASWriter.WriteRAS( rGraphic, rStream, pCallback, pCallerData, pOptionsConfig );
+    return aRASWriter.WriteRAS( rGraphic, rStream, pCallback, pCallerData, pConfigItem );
 }
 
 #pragma hdrstop
diff --git a/goodies/source/filter.vcl/expm/expm.cxx b/goodies/source/filter.vcl/expm/expm.cxx
index a989f5d1d0d5..adeb9e814f9d 100644
--- a/goodies/source/filter.vcl/expm/expm.cxx
+++ b/goodies/source/filter.vcl/expm/expm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: expm.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:13 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:38:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,7 +95,7 @@ public:
 
     BOOL                WriteXPM( const Graphic& rGraphic, SvStream& rXPM,
                                   PFilterCallback pCallback, void* pCallerdata,
-                                  Config* pOptionsConfig );
+                                  FilterConfigItem* pConfigItem );
 };
 
 //=================== Methoden von XPMWriter ==============================
@@ -132,7 +132,7 @@ BOOL XPMWriter::ImplCallback( USHORT nPercent )
 
 BOOL XPMWriter::WriteXPM( const Graphic& rGraphic, SvStream& rXPM,
                           PFilterCallback pCallback, void* pCallerdata,
-                          Config* pOptionsConfig )
+                          FilterConfigItem* pConfigItem )
 {
     Bitmap  aBmp;
 
@@ -247,7 +247,7 @@ void XPMWriter::ImplWriteNumber( sal_Int32 nNumber )
 {
     const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
 
-    for( sal_Int32 n = 0UL, nLen = aNum.Len(); n < nLen; n++  )
+    for( sal_Int16 n = 0UL, nLen = aNum.Len(); n < nLen; n++  )
         *mpOStm << aNum.GetChar( n );
 
 }
@@ -294,11 +294,11 @@ void XPMWriter::ImplWriteColor( USHORT nNumber )
 
 extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic,
                                                PFilterCallback pCallback, void* pCallerData,
-                                               Config* pOptionsConfig, BOOL )
+                                               FilterConfigItem* pConfigItem, BOOL )
 {
     XPMWriter aXPMWriter;
 
-    return aXPMWriter.WriteXPM( rGraphic, rStream, pCallback, pCallerData, pOptionsConfig );
+    return aXPMWriter.WriteXPM( rGraphic, rStream, pCallback, pCallerData, pConfigItem );
 }
 
 #pragma hdrstop
diff --git a/goodies/source/filter.vcl/idxf/idxf.cxx b/goodies/source/filter.vcl/idxf/idxf.cxx
index f630833b9304..db403876bac5 100644
--- a/goodies/source/filter.vcl/idxf/idxf.cxx
+++ b/goodies/source/filter.vcl/idxf/idxf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idxf.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:15 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:43:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,12 +70,12 @@
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #endif
 {
     DXFRepresentation aDXF;
diff --git a/goodies/source/filter.vcl/ieps/ieps.cxx b/goodies/source/filter.vcl/ieps/ieps.cxx
index 04260ed9536a..94584ed9773d 100644
--- a/goodies/source/filter.vcl/ieps/ieps.cxx
+++ b/goodies/source/filter.vcl/ieps/ieps.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ieps.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sj $ $Date: 2000-11-10 08:34:35 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:44:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,12 +171,12 @@ static int ImplGetLen( BYTE* pBuf, int nMax )
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #endif
 {
     if ( rStream.GetError() )
diff --git a/goodies/source/filter.vcl/ios2met/ios2met.cxx b/goodies/source/filter.vcl/ios2met/ios2met.cxx
index 272f3c9173e2..a0ae9699ca37 100644
--- a/goodies/source/filter.vcl/ios2met/ios2met.cxx
+++ b/goodies/source/filter.vcl/ios2met/ios2met.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ios2met.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sj $ $Date: 2000-09-28 14:39:10 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2281,7 +2281,7 @@ void OS2METReader::ReadImageData(USHORT nDataID, USHORT nDataLen)
 void OS2METReader::ReadFont(USHORT nFieldSize)
 {
     ULONG nPos, nMaxPos;
-    USHORT nLen,i;
+    USHORT nLen;
     BYTE nbyte, nTripType, nTripType2;
     OSFont * pF=new OSFont;
     pF->pSucc=pFontList; pFontList=pF;
@@ -2774,12 +2774,12 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #endif
 {
     OS2METReader    aOS2METReader;
diff --git a/goodies/source/filter.vcl/ipbm/ipbm.cxx b/goodies/source/filter.vcl/ipbm/ipbm.cxx
index d3840fa371a4..5dd06f71f2d1 100644
--- a/goodies/source/filter.vcl/ipbm/ipbm.cxx
+++ b/goodies/source/filter.vcl/ipbm/ipbm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ipbm.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:15 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:46:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -564,12 +564,12 @@ BOOL PBMReader::ImplReadBody()
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                        PFilterCallback pCallback, void * pCallerData,
+                            FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                        PFilterCallback pCallback, void * pCallerData,
+                            FilterConfigItem*, BOOL)
 #endif
 {
     PBMReader aPBMReader;
diff --git a/goodies/source/filter.vcl/ipcx/ipcx.cxx b/goodies/source/filter.vcl/ipcx/ipcx.cxx
index ce70ea8a8cd0..f97c40f77f10 100644
--- a/goodies/source/filter.vcl/ipcx/ipcx.cxx
+++ b/goodies/source/filter.vcl/ipcx/ipcx.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ipcx.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:15 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:47:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -439,12 +439,12 @@ void PCXReader::ImplReadPalette( ULONG nCol )
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #endif
 {
     PCXReader aPCXReader;
diff --git a/goodies/source/filter.vcl/ipict/ipict.cxx b/goodies/source/filter.vcl/ipict/ipict.cxx
index 9faa2659e86f..52e6bcaa3ea5 100644
--- a/goodies/source/filter.vcl/ipict/ipict.cxx
+++ b/goodies/source/filter.vcl/ipict/ipict.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ipict.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sj $ $Date: 2000-09-28 13:26:46 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:48:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1965,12 +1965,12 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile, P
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport( SvStream& rIStm, Graphic & rGraphic,
-                                      PFilterCallback pCallback, void * pCallerData,
-                                      Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport( SvStream& rIStm, Graphic & rGraphic,
-                               PFilterCallback pCallback, void * pCallerData,
-                               Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #endif
 {
     GDIMetaFile aMTF;
diff --git a/goodies/source/filter.vcl/ipsd/ipsd.cxx b/goodies/source/filter.vcl/ipsd/ipsd.cxx
index 1256fb4eea8f..4ea15257d5df 100644
--- a/goodies/source/filter.vcl/ipsd/ipsd.cxx
+++ b/goodies/source/filter.vcl/ipsd/ipsd.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ipsd.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:16 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:49:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -707,12 +707,12 @@ BOOL PSDReader::ImplReadBody()
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                        PFilterCallback pCallback, void * pCallerData,
+                            FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                        PFilterCallback pCallback, void * pCallerData,
+                            FilterConfigItem*, BOOL)
 #endif
 {
     PSDReader aPSDReader;
diff --git a/goodies/source/filter.vcl/iras/iras.cxx b/goodies/source/filter.vcl/iras/iras.cxx
index 791785446012..0e70de646659 100644
--- a/goodies/source/filter.vcl/iras/iras.cxx
+++ b/goodies/source/filter.vcl/iras/iras.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iras.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:16 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:50:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -397,12 +397,12 @@ BYTE RASReader::ImplGetByte()
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                        PFilterCallback pCallback, void * pCallerData,
+                            FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                        PFilterCallback pCallback, void * pCallerData,
+                            FilterConfigItem*, BOOL)
 #endif
 {
     RASReader aRASReader;
diff --git a/goodies/source/filter.vcl/itga/itga.cxx b/goodies/source/filter.vcl/itga/itga.cxx
index 3af6fc488f2c..8191bfe829fe 100644
--- a/goodies/source/filter.vcl/itga/itga.cxx
+++ b/goodies/source/filter.vcl/itga/itga.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itga.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:16 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:51:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -768,12 +768,12 @@ BOOL TGAReader::ImplReadPalette()
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData,
-                              Config *, BOOL)
+                            PFilterCallback pCallback, void * pCallerData,
+                                FilterConfigItem*, BOOL)
 #endif
 {
     TGAReader aTGAReader;
diff --git a/goodies/source/filter.vcl/itiff/itiff.cxx b/goodies/source/filter.vcl/itiff/itiff.cxx
index fcd7f2211f72..0729e6c73fb0 100644
--- a/goodies/source/filter.vcl/itiff/itiff.cxx
+++ b/goodies/source/filter.vcl/itiff/itiff.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itiff.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:16 $
+ *  last change: $Author: sj $ $Date: 2001-03-08 15:52:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1296,10 +1296,10 @@ BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic,
 
 #ifdef WNT
 extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData, Config *, BOOL)
+                              PFilterCallback pCallback, void * pCallerData, FilterConfigItem*, BOOL)
 #else
 extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic,
-                              PFilterCallback pCallback, void * pCallerData, Config *, BOOL)
+                              PFilterCallback pCallback, void * pCallerData, FilterConfigItem*, BOOL)
 #endif
 {
     TIFFReader aTIFFReader;