diff -urN ooo_1.1.0_src.orig/basic/source/app/app.cxx ooo_1.1.0_src/basic/source/app/app.cxx
--- ooo_1.1.0_src.orig/basic/source/app/app.cxx	Sat Nov 15 22:59:42 2003
+++ ooo_1.1.0_src/basic/source/app/app.cxx	Sun Nov 16 20:37:14 2003
@@ -1578,9 +1578,9 @@
 				}
 
 
-				long nTitleHeight;
+				sal_Int32 nTitleHeight;
 				{
-					long nDummy1, nDummy2, nDummy3;
+					sal_Int32 nDummy1, nDummy2, nDummy3;
 					GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
 				}
 
@@ -1602,9 +1602,9 @@
 				}
 
 
-				long nTitleHeight;
+				sal_Int32 nTitleHeight;
 				{
-					long nDummy1, nDummy2, nDummy3;
+					sal_Int32 nDummy1, nDummy2, nDummy3;
 					GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
 				}
 
@@ -1630,9 +1630,9 @@
 				}
 
 
-				long nTitleHeight;
+				sal_Int32 nTitleHeight;
 				{
-					long nDummy1, nDummy2, nDummy3;
+					sal_Int32 nDummy1, nDummy2, nDummy3;
 					GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
 				}
 
diff -urN ooo_1.1.0_src.orig/basic/source/app/appwin.cxx ooo_1.1.0_src/basic/source/app/appwin.cxx
--- ooo_1.1.0_src.orig/basic/source/app/appwin.cxx	Sat Nov 15 22:59:42 2003
+++ ooo_1.1.0_src/basic/source/app/appwin.cxx	Sun Nov 16 20:37:14 2003
@@ -154,9 +154,9 @@
 		pFrame->nMaximizedWindows++;
 		nWinState = TT_WIN_STATE_MAX;
 	}
-	long nTitleHeight;
+	sal_Int32 nTitleHeight;
 	{
-		long nDummy1, nDummy2, nDummy3;
+		sal_Int32 nDummy1, nDummy2, nDummy3;
 		pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
 	}
 
@@ -198,9 +198,9 @@
 	nNr %= 10;
 	nNr++;
 
-	long nTitleHeight;
+	sal_Int32 nTitleHeight;
 	{
-		long nDummy1, nDummy2, nDummy3;
+		sal_Int32 nDummy1, nDummy2, nDummy3;
 		pFrame->GetBorder( nDummy1, nTitleHeight, nDummy2, nDummy3 );
 	}
 
diff -urN ooo_1.1.0_src.orig/basic/source/inc/runtime.hxx ooo_1.1.0_src/basic/source/inc/runtime.hxx
--- ooo_1.1.0_src.orig/basic/source/inc/runtime.hxx	Sat Nov 15 22:59:42 2003
+++ ooo_1.1.0_src/basic/source/inc/runtime.hxx	Sun Nov 16 20:37:14 2003
@@ -204,7 +204,7 @@
 	SvNumberFormatter* pNumberFormatter;
     LanguageType    meFormatterLangType;
     DateFormat      meFormatterDateFormat;
-	ULONG 			nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;
+	sal_uInt32 			nStdDateIdx, nStdTimeIdx, nStdDateTimeIdx;
 
 	SbError      	nErr;     		// aktueller Fehlercode
 	String		    aErrorMsg;		// letzte Error-Message fuer $ARG
@@ -251,13 +251,13 @@
 	SbiRTLData* GetRTLData() const { return (SbiRTLData*)&aRTLData; }
 
 	SvNumberFormatter* GetNumberFormatter();
-	ULONG GetStdDateIdx() const { return nStdDateIdx; }
-	ULONG GetStdTimeIdx() const { return nStdTimeIdx; }
-	ULONG GetStdDateTimeIdx() const { return nStdDateTimeIdx; }
+	sal_uInt32 GetStdDateIdx() const { return nStdDateIdx; }
+	sal_uInt32 GetStdTimeIdx() const { return nStdTimeIdx; }
+	sal_uInt32 GetStdDateTimeIdx() const { return nStdDateTimeIdx; }
 
 	// #39629# NumberFormatter auch statisch anbieten
 	static void PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
-		ULONG &rnStdDateIdx, ULONG &rnStdTimeIdx, ULONG &rnStdDateTimeIdx,
+		sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
         LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL );
 };
 
diff -urN ooo_1.1.0_src.orig/basic/source/runtime/methods.cxx ooo_1.1.0_src/basic/source/runtime/methods.cxx
--- ooo_1.1.0_src.orig/basic/source/runtime/methods.cxx	Sat Nov 15 22:59:42 2003
+++ ooo_1.1.0_src/basic/source/runtime/methods.cxx	Sun Nov 16 20:37:14 2003
@@ -1622,11 +1622,11 @@
 			pFormatter = pINST->GetNumberFormatter();
 		else
 		{
-			ULONG n;	// Dummy
+			sal_uInt32 n;	// Dummy
 			SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
 		}
 
-		ULONG nIndex;
+		sal_uInt32 nIndex;
 		double fResult;
 		String aStr( rPar.Get(1)->GetString() );
 		BOOL bSuccess = pFormatter->IsNumberFormat( aStr, nIndex, fResult );
@@ -1665,11 +1665,11 @@
 			pFormatter = pINST->GetNumberFormatter();
 		else
 		{
-			ULONG n;	// Dummy
+			sal_uInt32 n;	// Dummy
 			SbiInstance::PrepareNumberFormatter( pFormatter, n, n, n );
 		}
 
-		ULONG nIndex;
+		sal_uInt32 nIndex;
 		double fResult;
 		BOOL bSuccess = pFormatter->IsNumberFormat( rPar.Get(1)->GetString(),
 												   nIndex, fResult );
@@ -1847,7 +1847,7 @@
 
 			// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
 			SvNumberFormatter* pFormatter = NULL;
-			ULONG nIndex;
+			sal_uInt32 nIndex;
 			if( pINST )
 			{
 				pFormatter = pINST->GetNumberFormatter();
@@ -1855,7 +1855,7 @@
 			}
 			else
 			{
-				ULONG n;	// Dummy
+				sal_uInt32 n;	// Dummy
 				SbiInstance::PrepareNumberFormatter( pFormatter, n, nIndex, n );
 			}
 
@@ -1898,7 +1898,7 @@
 
 			// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
 			SvNumberFormatter* pFormatter = NULL;
-			ULONG nIndex;
+			sal_uInt32 nIndex;
 			if( pINST )
 			{
 				pFormatter = pINST->GetNumberFormatter();
@@ -1906,7 +1906,7 @@
 			}
 			else
 			{
-				ULONG n;	// Dummy
+				sal_uInt32 n;	// Dummy
 				SbiInstance::PrepareNumberFormatter( pFormatter, nIndex, n, n );
 			}
 
@@ -2777,7 +2777,7 @@
 
 		// #39629 pINST pruefen, kann aus URL-Zeile gerufen werden
 		SvNumberFormatter* pFormatter = NULL;
-		ULONG nIndex;
+		sal_uInt32 nIndex;
 		if( pINST )
 		{
 			pFormatter = pINST->GetNumberFormatter();
@@ -2785,7 +2785,7 @@
 		}
 		else
 		{
-			ULONG n;	// Dummy
+			sal_uInt32 n;	// Dummy
 			SbiInstance::PrepareNumberFormatter( pFormatter, n, n, nIndex );
 		}
 
diff -urN ooo_1.1.0_src.orig/basic/source/runtime/runtime.cxx ooo_1.1.0_src/basic/source/runtime/runtime.cxx
--- ooo_1.1.0_src.orig/basic/source/runtime/runtime.cxx	Sat Nov 15 22:59:42 2003
+++ ooo_1.1.0_src/basic/source/runtime/runtime.cxx	Sun Nov 16 20:37:14 2003
@@ -365,7 +365,7 @@
 
 // #39629 NumberFormatter auch statisch anbieten
 void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
-	ULONG &rnStdDateIdx, ULONG &rnStdTimeIdx, ULONG &rnStdDateTimeIdx,
+	sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
     LanguageType* peFormatterLangType, DateFormat* peFormatterDateFormat )
 {
 	com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >