diff -urN ooo_1.1.0_src.orig/framework/inc/recording/dispatchrecorder.hxx ooo_1.1.0_src/framework/inc/recording/dispatchrecorder.hxx
--- ooo_1.1.0_src.orig/framework/inc/recording/dispatchrecorder.hxx	Sat Nov 15 23:00:15 2003
+++ ooo_1.1.0_src/framework/inc/recording/dispatchrecorder.hxx	Sun Nov 16 20:37:16 2003
@@ -126,9 +126,9 @@
 
 	virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException);
 
-	virtual com::sun::star::uno::Any SAL_CALL getByIndex(long int)  throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::WrappedTargetException, com::sun::star::lang::IndexOutOfBoundsException);
+	virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32)  throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::WrappedTargetException, com::sun::star::lang::IndexOutOfBoundsException);
 
-	virtual void SAL_CALL replaceByIndex(long int, const com::sun::star::uno::Any&)  throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+	virtual void SAL_CALL replaceByIndex(sal_Int32, const com::sun::star::uno::Any&)  throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // private functions
     private:
diff -urN ooo_1.1.0_src.orig/framework/inc/services/pluginframe.hxx ooo_1.1.0_src/framework/inc/services/pluginframe.hxx
--- ooo_1.1.0_src.orig/framework/inc/services/pluginframe.hxx	Sat Nov 15 23:00:15 2003
+++ ooo_1.1.0_src/framework/inc/services/pluginframe.hxx	Sun Nov 16 20:37:16 2003
@@ -395,7 +395,7 @@
 			@onerror	-
 		*//*-*****************************************************************************************************/
 
-		virtual long doIt();
+		virtual sal_Int32 doIt();
 
 	//-------------------------------------------------------------------------------------------------------------
 	//	private variables
diff -urN ooo_1.1.0_src.orig/framework/source/services/logindialog.cxx ooo_1.1.0_src/framework/source/services/logindialog.cxx
--- ooo_1.1.0_src.orig/framework/source/services/logindialog.cxx	Sat Nov 15 23:00:16 2003
+++ ooo_1.1.0_src/framework/source/services/logindialog.cxx	Sun Nov 16 20:37:16 2003
@@ -408,7 +408,7 @@
 
 	if ( aProxyHostPort.indexOf( (sal_Unicode)':' ) > 0 ) // is there a port
 	{
-		long nTokenIndex = 0;
+		sal_Int32 nTokenIndex = 0;
 		OUString tmp = aProxyHostPort.getToken( 0, (sal_Unicode)':', nTokenIndex );
 		aPort = aProxyHostPort.getToken( 0, (sal_Unicode)':', nTokenIndex );
 		aHost = tmp;