Index: source/packer/packer2.cxx
===================================================================
RCS file: /cvs/util/extensions/source/packer/packer2.cxx,v
retrieving revision 1.8
retrieving revision 1.8.102.1
diff -u -r1.8 -r1.8.102.1
--- source/packer/packer2.cxx	8 Sep 2005 19:48:51 -0000	1.8
+++ source/packer/packer2.cxx	28 Feb 2006 10:50:55 -0000	1.8.102.1
@@ -817,10 +817,10 @@
 
 		if( nLastErrorCode == ERRCODE_NONE )
 		{
-			ULONG nPID;
+			sal_uInt32 nPID;
 			USHORT nVersion;
 			USHORT nMaxDisk;
-			ULONG nID;
+			sal_uInt32 nID;
 			nLastErrorCode = readHeader( *pInOutStream, nPID, nVersion, nCurrentDisk, nMaxDisk, nID );
 		}
 		else
@@ -934,9 +934,9 @@
 {
 	ULONG nLastErrorCode = ERRCODE_NONE;
 
-	ULONG nPID;
+	sal_uInt32 nPID;
 	USHORT nDisk;
-	ULONG nID;
+	sal_uInt32 nID;
 	USHORT nVersion;
 
 	maActualFile = source ;
@@ -973,7 +973,7 @@
 /*
 ** read the archive header
 */
-ULONG UnoPacker_Impl::readHeader( SvFileStream& rStream, ULONG& nPID, USHORT &nVersion, USHORT &nDisk, USHORT& nMaxDisk, ULONG& nID )
+ULONG UnoPacker_Impl::readHeader( SvFileStream& rStream, sal_uInt32& nPID, USHORT &nVersion, USHORT &nDisk, USHORT& nMaxDisk, sal_uInt32& nID )
 {
 	nPID = NULL; nVersion = 0; nDisk = 0; nMaxDisk = 0; nID = 0;
 
@@ -1094,10 +1094,10 @@
 
 				if( nLastErrorCode == ERRCODE_NONE )
 				{
-					ULONG nPID;
+					sal_uInt32 nPID;
 					USHORT nVersion;
 					USHORT nMaxDisk;
-					ULONG nID;
+					sal_uInt32 nID;
 					nLastErrorCode = readHeader( *pInStream, nPID, nVersion, nCurrentDisk, nMaxDisk, nID );
 				}
 				else
Index: source/packer/packer2.hxx
===================================================================
RCS file: /cvs/util/extensions/source/packer/packer2.hxx,v
retrieving revision 1.2
retrieving revision 1.2.102.1
diff -u -r1.2 -r1.2.102.1
--- source/packer/packer2.hxx	8 Sep 2005 19:49:07 -0000	1.2
+++ source/packer/packer2.hxx	28 Feb 2006 10:50:55 -0000	1.2.102.1
@@ -92,7 +92,7 @@
   
 \* ******************************************************************/
 
-const ULONG PACK_ID = ((('S' << 8 | 'Z' ) << 8 | 'I' ) << 8 | 'P' );
+const sal_uInt32 PACK_ID = ((('S' << 8 | 'Z' ) << 8 | 'I' ) << 8 | 'P' );
 const USHORT HEADER_SIZE = 2*sizeof( ULONG ) + 3*sizeof( USHORT );
 
 class LocalFileHeader
@@ -100,14 +100,14 @@
 private:
 	USHORT	m_nCompression;		// compression method
 
-	ULONG	m_nCompressedSize;	// compressed size
-	ULONG	m_nUnCompressedSize;// uncompressed size
+	sal_uInt32 m_nCompressedSize;	// compressed size
+	sal_uInt32 m_nUnCompressedSize;// uncompressed size
 
 	::rtl::OUString	m_aFileName;		// name of this file;
 	String	m_aSourcePath;
 
 	USHORT	m_nDiskNumberStart;	// the disk where this file starts
-	ULONG	m_nRelativeOffset;	// relative offset of local header
+	sal_uInt32 m_nRelativeOffset;	// relative offset of local header
 
 	void	init();
 public:
@@ -122,8 +122,8 @@
 	::rtl::OUString	getFileName() const { return m_aFileName; }
 	String	getSourcePath() const { return m_aSourcePath; }
 
-	void	setCompressedSize( ULONG nSize ) { m_nCompressedSize = nSize; }
-	ULONG	getCompressedSize() const { return m_nCompressedSize; }
+	void	setCompressedSize( sal_uInt32 nSize ) { m_nCompressedSize = nSize; }
+	sal_uInt32 getCompressedSize() const { return m_nCompressedSize; }
 
 	void	setUnCompressedSize( ULONG nSize ) { m_nUnCompressedSize = nSize; }
 	ULONG	getUnCompressedSize() const { return m_nUnCompressedSize; }
@@ -193,7 +193,7 @@
 	void getParameter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); 
 
 	BOOL readHeaders( const ::rtl::OUString& source );
-	ULONG readHeader( SvFileStream& rStream, ULONG& nPID, USHORT &nVersion, USHORT &nDisk, USHORT& nMaxDisk, ULONG& nID );
+	ULONG readHeader( SvFileStream& rStream, sal_uInt32& nPID, USHORT &nVersion, USHORT &nDisk, USHORT& nMaxDisk, sal_uInt32& nID );
 	ULONG readFileHeader( SvFileStream& rStream );
 	ULONG unpackArchive( const ::rtl::OUString& source );
 	SvFileStream* createOutputStream( LocalFileHeader* pHeader );
Index: source/plugin/base/xplugin.cxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/base/xplugin.cxx,v
retrieving revision 1.17
retrieving revision 1.17.102.1
diff -u -r1.17 -r1.17.102.1
--- source/plugin/base/xplugin.cxx	8 Sep 2005 19:52:34 -0000	1.17
+++ source/plugin/base/xplugin.cxx	28 Feb 2006 10:50:56 -0000	1.17.102.1
@@ -91,7 +91,7 @@
     {
         if( m_pPlugin->isDisposable() )
         {
-            sal_uInt32 nEvent;
+            ULONG nEvent;
             Application::PostUserEvent( nEvent, LINK( m_pPlugin, XPlugin_Impl, secondLevelDispose ), (void*)m_pPlugin );
         }
     }
Index: source/scanner/sane.cxx
===================================================================
RCS file: /cvs/util/extensions/source/scanner/sane.cxx,v
retrieving revision 1.10
retrieving revision 1.10.102.1
diff -u -r1.10 -r1.10.102.1
--- source/scanner/sane.cxx	8 Sep 2005 20:36:56 -0000	1.10
+++ source/scanner/sane.cxx	28 Feb 2006 10:50:56 -0000	1.10.102.1
@@ -616,9 +616,9 @@
 
 	// write bitmap stream header
 	aConverter << 'B' << 'M';
-	aConverter << (ULONG) 0;
-	aConverter << (ULONG) 0;
-	aConverter << (ULONG) 60;
+	aConverter << (sal_uInt32) 0;
+	aConverter << (sal_uInt32) 0;
+	aConverter << (sal_uInt32) 60;
 
 	// write BITMAPINFOHEADER
 	aConverter << (UINT32)40;
@@ -779,7 +779,7 @@
 			if( eType == FrameStyle_BW )
 			{
 				aConverter.Seek( 10 );
-				aConverter << (ULONG)64;
+				aConverter << (sal_uInt32)64;
 				aConverter.Seek( 28 );
 				aConverter << (UINT16) 1;
 				aConverter.Seek( 54 );
@@ -793,7 +793,7 @@
 			else if( eType == FrameStyle_Gray )
 			{
  				aConverter.Seek( 10 );
- 				aConverter << (ULONG)1084;
+ 				aConverter << (sal_uInt32)1084;
 				aConverter.Seek( 28 );
 				aConverter << (UINT16) 8;
 				aConverter.Seek( 54 );
@@ -879,7 +879,7 @@
 	int nPos = aConverter.Tell();
 
 	aConverter.Seek( 2 );
-	aConverter << (ULONG) nPos+1;
+	aConverter << (sal_uInt32) nPos+1;
 	aConverter.Seek( 0 );
 
 	rBitmap.unlock();