Fix for amd64

6 files changed, 111 insertions, 5 deletions

diff --git a/editors/openoffice.org-2.0-devel/files/patch-i65467 b/editors/openoffice.org-2.0-devel/files/patch-i65467
index cbaef34381fe..94c1b552d13d 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-i65467
+++ b/editors/openoffice.org-2.0-devel/files/patch-i65467
@@ -2068,9 +2068,9 @@
 +void fillUnoException(
 +    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
 +}
---- /dev/null	Wed Dec 31 19:00:00 1969
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Wed Mar  8 03:51:19 2006
-@@ -0,0 +1,645 @@
+--- /dev/null	Fri Jun 30 17:04:00 2006
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Fri Jun 30 17:04:03 2006
+@@ -0,0 +1,649 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -2587,9 +2587,11 @@
 +
 +
 +//==================================================================================================
-+void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
++namespace bridges { namespace cpp_uno { namespace shared {
++
++void unoInterfaceProxyDispatch(
 +	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-+	void * pReturn, void * pArgs[], uno_Any ** ppException ) SAL_THROW(())
++	void * pReturn, void * pArgs[], uno_Any ** ppException )
 +{
 +	// is my surrogate
 +	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
@@ -2716,3 +2718,5 @@
 +	}
 +	}
 +}
++
++} } }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66726 b/editors/openoffice.org-2.0-devel/files/patch-i66726
new file mode 100644
index 000000000000..4294743373fa
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i66726
@@ -0,0 +1,21 @@
+Index: tools/source/inet/inetmsg.cxx
+===================================================================
+RCS file: /cvs/util/tools/source/inet/inetmsg.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.6.1
+diff -u -r1.8 -r1.8.6.1
+--- tools/source/inet/inetmsg.cxx	19 Jun 2006 13:46:21 -0000	1.8
++++ tools/source/inet/inetmsg.cxx	27 Jun 2006 11:30:46 -0000	1.8.6.1
+@@ -1390,9 +1390,11 @@
+         // Generate a unique boundary from current time.
+         sal_Char sTail[16 + 1];
+         Time aCurTime;
++        sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
++        nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
+         sprintf (sTail, "%08X%08X",
+                  static_cast< unsigned int >(aCurTime.GetTime()),
+-                 reinterpret_cast< unsigned int >(this));
++                 static_cast< unsigned int >(nThis));
+         m_aBoundary = "------------_4D48";
+         m_aBoundary += sTail;
+ 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66727 b/editors/openoffice.org-2.0-devel/files/patch-i66727
new file mode 100644
index 000000000000..8931f2397c1c
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i66727
@@ -0,0 +1,26 @@
+Index: sot/source/sdstor/ucbstorage.cxx
+===================================================================
+RCS file: /cvs/util/sot/source/sdstor/ucbstorage.cxx,v
+retrieving revision 1.90
+retrieving revision 1.90.2.1
+diff -u -r1.90 -r1.90.2.1
+--- sot/source/sdstor/ucbstorage.cxx	20 Jun 2006 05:56:00 -0000	1.90
++++ sot/source/sdstor/ucbstorage.cxx	27 Jun 2006 10:01:10 -0000	1.90.2.1
+@@ -554,7 +554,7 @@
+ 																		// this class is close to be unusable
+ 																		// since it can not read and write
+     using SvStream::SetError;
+-    void                        SetError( long nError );
++    void                        SetError( sal_uInt32 nError );
+ 	void						PrepareCachedForReopen( StreamMode nMode );
+ };
+ 
+@@ -1216,7 +1216,7 @@
+     m_bCommited = TRUE;
+ }
+ 
+-void UCBStorageStream_Impl::SetError( long nErr )
++void UCBStorageStream_Impl::SetError( sal_uInt32 nErr )
+ {
+     if ( !m_nError )
+     {
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66728 b/editors/openoffice.org-2.0-devel/files/patch-i66728
new file mode 100644
index 000000000000..f4cbb8327951
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i66728
@@ -0,0 +1,17 @@
+Index: xmloff/source/style/impastp4.cxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/style/impastp4.cxx,v
+retrieving revision 1.17
+retrieving revision 1.17.8.1
+diff -u -r1.17 -r1.17.8.1
+--- xmloff/source/style/impastp4.cxx	19 Jun 2006 18:33:22 -0000	1.17
++++ xmloff/source/style/impastp4.cxx	27 Jun 2006 13:15:34 -0000	1.17.8.1
+@@ -276,7 +276,7 @@
+ {
+ 	OUString sName;
+ 
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	XMLFamilyData_Impl aTemporary( nFamily );
+ 	XMLFamilyData_Impl *pFamily = 0;
+ 	if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) )
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66729 b/editors/openoffice.org-2.0-devel/files/patch-i66729
new file mode 100644
index 000000000000..31893681634c
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i66729
@@ -0,0 +1,17 @@
+Index: connectivity/source/drivers/dbase/DTable.cxx
+===================================================================
+RCS file: /cvs/dba/connectivity/source/drivers/dbase/DTable.cxx,v
+retrieving revision 1.94
+retrieving revision 1.94.4.1
+diff -u -r1.94 -r1.94.4.1
+--- connectivity/source/drivers/dbase/DTable.cxx	20 Jun 2006 01:21:12 -0000	1.94
++++ connectivity/source/drivers/dbase/DTable.cxx	27 Jun 2006 20:00:34 -0000	1.94.4.1
+@@ -2408,7 +2408,7 @@
+ 				return sal_False;
+ 			}
+ 
+-			ULONG nLength;
++			sal_uInt32 nLength(0);
+ 			(*m_pMemoStream) >> nLength;
+ 
+ 			if (m_aMemoHeader.db_typ == MemodBaseIV)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i66730 b/editors/openoffice.org-2.0-devel/files/patch-i66730
new file mode 100644
index 000000000000..d03e672a08d8
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i66730
@@ -0,0 +1,21 @@
+Index: automation/source/server/sta_list.cxx
+===================================================================
+RCS file: /cvs/util/automation/source/server/sta_list.cxx,v
+retrieving revision 1.18
+retrieving revision 1.18.4.1
+diff -u -r1.18 -r1.18.4.1
+--- automation/source/server/sta_list.cxx	20 Jun 2006 00:24:33 -0000	1.18
++++ automation/source/server/sta_list.cxx	28 Jun 2006 07:43:33 -0000	1.18.4.1
+@@ -992,7 +992,11 @@
+ 	WRITEc("UId : ");
+ 	WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
+ 	WRITEc(":0x");
+-    WRITE(String::CreateFromInt32( sal_Int32(pBase), 16 ));
++    WRITE(
++        String::CreateFromInt64(
++            sal::static_int_cast< sal_Int64 >(
++                reinterpret_cast< sal_IntPtr >(pBase)),
++            16 ));
+ 	WRITEc(":");
+ 	WRITE(pBase->GetQuickHelpText());
+ 	WRITEc(":");