diff -urN ooo_1.1.0_src.orig/so3/inc/embobj.hxx ooo_1.1.0_src/so3/inc/embobj.hxx
--- ooo_1.1.0_src.orig/so3/inc/embobj.hxx	Sat Nov 15 22:59:33 2003
+++ ooo_1.1.0_src/so3/inc/embobj.hxx	Mon Nov 17 00:45:54 2003
@@ -145,7 +145,7 @@
 	virtual USHORT  FuzzyLock( BOOL bLock, BOOL bIntern, BOOL bClose );
 
 	virtual void    FillClass( SvGlobalName * pClassName,
-							   ULONG * pFormat,
+							   sal_uInt32 * pFormat,
 							   String * pAppName,
 							   String * pFullTypeName,
 							   String * pShortTypeName,
diff -urN ooo_1.1.0_src.orig/so3/inc/persist.hxx ooo_1.1.0_src/so3/inc/persist.hxx
--- ooo_1.1.0_src.orig/so3/inc/persist.hxx	Sat Nov 15 22:59:33 2003
+++ ooo_1.1.0_src/so3/inc/persist.hxx	Mon Nov 17 00:43:07 2003
@@ -199,7 +199,7 @@
 	void            SetupStorage( SvStorage * pStor ) const;
 
 	virtual void    FillClass( SvGlobalName * pClassName,
-							   ULONG * pFormat,
+							   sal_uInt32 * pFormat,
 							   String * pAppName,
 							   String * pFullTypeName,
 							   String * pShortTypeName,
diff -urN ooo_1.1.0_src.orig/so3/source/inplace/embobj.cxx ooo_1.1.0_src/so3/source/inplace/embobj.cxx
--- ooo_1.1.0_src.orig/so3/source/inplace/embobj.cxx	Sat Nov 15 22:59:33 2003
+++ ooo_1.1.0_src/so3/source/inplace/embobj.cxx	Mon Nov 17 00:47:14 2003
@@ -634,7 +634,7 @@
 void SvEmbeddedObject::FillClass
 (
 	SvGlobalName * pClassName,	/* Der Typ der Klasse */
-	ULONG * pFormat,			/* Das Dateiformat in dem geschrieben wird */
+	sal_uInt32 * pFormat,			/* Das Dateiformat in dem geschrieben wird */
 	String * pAppName,			/* Der Applikationsname */
 	String * pFullTypeName,     /* Der genaue Name des Typs	*/
 	String * pShortTypeName,	/* Der kurze Name des Typs	*/
@@ -667,7 +667,7 @@
 void SvEmbeddedObject::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ) const
 {
 	String aAppName, aShortName;
-	ULONG  nClipFormat;
+	sal_uInt32  nClipFormat;
 
 	FillClass( &rDesc.maClassName, &nClipFormat, &aAppName, &rDesc.maTypeName, &aShortName );
 	rDesc.mnViewAspect = ASPECT_CONTENT;
diff -urN ooo_1.1.0_src.orig/so3/source/misc/factory.cxx ooo_1.1.0_src/so3/source/misc/factory.cxx
--- ooo_1.1.0_src.orig/so3/source/misc/factory.cxx	Sat Nov 15 22:59:33 2003
+++ ooo_1.1.0_src/so3/source/misc/factory.cxx	Sun Nov 16 21:53:29 2003
@@ -1309,7 +1309,7 @@
 //=========================================================================
 SvGlobalName SvFactory::GetSvClass
 (
-	long nFileFormat,
+	INT32 nFileFormat,
 	const SvGlobalName & rClass
 )
 /*  [Beschreibung]
diff -urN ooo_1.1.0_src.orig/so3/source/persist/persist.cxx ooo_1.1.0_src/so3/source/persist/persist.cxx
--- ooo_1.1.0_src.orig/so3/source/persist/persist.cxx	Sat Nov 15 22:59:33 2003
+++ ooo_1.1.0_src/so3/source/persist/persist.cxx	Mon Nov 17 00:48:07 2003
@@ -475,7 +475,7 @@
 void SvPersist::FillClass
 (
 	SvGlobalName * pClassName,  /* Der Typ der Klasse */
-	ULONG * pFormat,            /* Das Dateiformat in dem geschrieben wird */
+	sal_uInt32 * pFormat,            /* Das Dateiformat in dem geschrieben wird */
 	String * pAppName,          /* Der Applikationsname */
 	String * pFullTypeName,     /* Der genaue Name des Typs */
 	String * pShortTypeName,    /* Der kurze Name des Typs  */
@@ -538,7 +538,7 @@
 {
 	SvGlobalName    aName;
 	String          aAppName, aFullTypeName, aShortTypeName;
-	ULONG           nFormat;
+	sal_uInt32           nFormat;
 
 	FillClass( &aName, &nFormat, &aAppName, &aFullTypeName,
 				&aShortTypeName );
@@ -558,7 +558,7 @@
 {
 	SvGlobalName    aName;
 	String          aAppName, aFullTypeName, aShortTypeName;
-	ULONG           nFormat;
+	sal_uInt32           nFormat;
 
 	FillClass( &aName, &nFormat, &aAppName, &aFullTypeName,
 				&aShortTypeName );
@@ -578,7 +578,7 @@
 {
 	SvGlobalName    aName;
 	String          aAppName, aFullTypeName, aShortTypeName;
-	ULONG           nFormat;
+	sal_uInt32           nFormat;
 
 	FillClass( &aName, &nFormat, &aAppName, &aFullTypeName,
 				&aShortTypeName );
@@ -594,7 +594,7 @@
 {
 	SvUniqueName    aName;
 	String          aFullTypeName, aShortTypeName, aAppName;
-	ULONG           nClipFormat;
+	sal_uInt32           nClipFormat;
 	FillClass( &aName, &nClipFormat, &aAppName,
 				&aFullTypeName, &aShortTypeName, pStor->GetVersion() );
 	pStor->SetClass( aName, nClipFormat, aShortTypeName );
diff -urN ooo_1.1.0_src.orig/so3/source/persist/transprt.cxx ooo_1.1.0_src/so3/source/persist/transprt.cxx
--- ooo_1.1.0_src.orig/so3/source/persist/transprt.cxx	Sat Nov 15 22:59:33 2003
+++ ooo_1.1.0_src/so3/source/persist/transprt.cxx	Sun Nov 16 21:53:29 2003
@@ -1130,7 +1130,7 @@
 	sal_Int32 nSize = 0;
 	while (nSize < nBytesToRead)
 	{
-		ULONG nCount = 0;
+		sal_uInt32 nCount = 0;
 		ErrCode nError = m_xLockBytes->ReadAt (
 			m_nPosition,
 			rData.getArray() + nSize,
@@ -1159,7 +1159,7 @@
 		throw NotConnectedException();
 
 	rData.realloc(nMaxBytesToRead);
-	ULONG nCount;
+	sal_uInt32 nCount;
 	ErrCode nError;
 	do
 	{