diff -urN ooo_1.1.0_src.orig/goodies/source/filter.vcl/eos2met/eos2met.cxx ooo_1.1.0_src/goodies/source/filter.vcl/eos2met/eos2met.cxx
--- ooo_1.1.0_src.orig/goodies/source/filter.vcl/eos2met/eos2met.cxx	Sat Nov 15 22:59:11 2003
+++ ooo_1.1.0_src/goodies/source/filter.vcl/eos2met/eos2met.cxx	Sun Nov 16 11:59:34 2003
@@ -1966,7 +1966,7 @@
 				const MetaStretchTextAction*	pA = (const MetaStretchTextAction*) pMA;
 				VirtualDevice					aVDev;
 				USHORT							i;
-				long*							pDXAry;
+				sal_Int32*							pDXAry;
 				sal_Int32						nNormSize;
 				String							aStr;
 				Polygon							aPolyDummy(1);
@@ -1991,7 +1991,7 @@
 				METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
 				METSetChrSet(FindChrSet(aGDIFont));
 				aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());
-				pDXAry=new long[aStr.Len()];
+				pDXAry=new sal_Int32[aStr.Len()];
 				nNormSize = aVDev.GetTextArray( aStr, pDXAry );
 
 				for ( i = 0; i < aStr.Len(); i++ )
diff -urN ooo_1.1.0_src.orig/goodies/source/filter.vcl/epict/epict.cxx ooo_1.1.0_src/goodies/source/filter.vcl/epict/epict.cxx
--- ooo_1.1.0_src.orig/goodies/source/filter.vcl/epict/epict.cxx	Sat Nov 15 22:59:11 2003
+++ ooo_1.1.0_src/goodies/source/filter.vcl/epict/epict.cxx	Sun Nov 16 11:59:35 2003
@@ -214,7 +214,7 @@
 	void SetAttrForFrame();
 	void SetAttrForText();
 
-	void WriteTextArray(Point & rPoint, const String& rString, const long * pDXAry);
+	void WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry);
 
 	void WriteOpcodes(const GDIMetaFile & rMTF);
 
@@ -1391,7 +1391,7 @@
 }
 
 
-void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const long * pDXAry)
+void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry)
 {
 	USHORT i,nLen;
 	sal_Unicode c;
@@ -1749,7 +1749,7 @@
 				Point                           aPt( pA->GetPoint() );
 				String                          aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );
 				VirtualDevice                   aVirDev;
-				long*                           pDXAry = new long[ aStr.Len() ];
+				sal_Int32*                           pDXAry = new sal_Int32[ aStr.Len() ];
 				sal_Int32						nNormSize( aVirDev.GetTextArray( aStr,pDXAry ) );
 				USHORT                          i;
 
diff -urN ooo_1.1.0_src.orig/goodies/source/filter.vcl/epng/epng.cxx ooo_1.1.0_src/goodies/source/filter.vcl/epng/epng.cxx
--- ooo_1.1.0_src.orig/goodies/source/filter.vcl/epng/epng.cxx	Sat Nov 15 22:59:11 2003
+++ ooo_1.1.0_src/goodies/source/filter.vcl/epng/epng.cxx	Sun Nov 16 11:59:35 2003
@@ -119,7 +119,7 @@
 	BYTE*				mpCurrentScan;
 	ULONG				mnDeflateInSize;
 
-	ULONG				mnWidth, mnHeight;
+	sal_uInt32			mnWidth, mnHeight;
 	BYTE				mnBitsPerPixel;
 	BYTE				mnFilterType;			// 0 oder 4;
 	ULONG				mnBBP;					// bytes per pixel ( needed for filtering )
@@ -138,7 +138,7 @@
 	void				ImplWritePalette();
 	void				ImplOpenChunk( ULONG nChunkType );
 	void				ImplWriteChunk( BYTE nNumb );
-	void				ImplWriteChunk( ULONG nNumb );
+	void				ImplWriteChunk( sal_uInt32 nNumb );
 	void				ImplWriteChunk( unsigned char* pSource, long nDatSize );
 	void				ImplCloseChunk( void );
 
@@ -346,8 +346,8 @@
 	*mpOStm << (ULONG)0x0d0a1a0a;
 
 	ImplOpenChunk(PNGCHUNK_IHDR);
-	ImplWriteChunk( ( mnWidth = (ULONG)mpAccess->Width() ) );
-	ImplWriteChunk( ( mnHeight = (ULONG)mpAccess->Height() ) );
+	ImplWriteChunk( ( mnWidth = (sal_uInt32)mpAccess->Width() ) );
+	ImplWriteChunk( ( mnHeight = (sal_uInt32)mpAccess->Height() ) );
 
 	if ( mnWidth && mnHeight && mnBitsPerPixel && mbStatus )
 	{
@@ -719,7 +719,7 @@
 	*mpOStm << nSource;
 }
 
-void PNGWriter::ImplWriteChunk ( ULONG nSource )
+void PNGWriter::ImplWriteChunk ( sal_uInt32 nSource )
 {
 	mnChunkDatSize+=4;
 	*mpOStm << nSource;