mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
Fix for amd64
This commit is contained in:
Maho Nakata
parent
0f2167214f
commit
d34db60582
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=166682
@ -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 @@
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+} } }
|
||||
|
||||
21
editors/openoffice-3-devel/files/patch-i66726
Normal file
21
editors/openoffice-3-devel/files/patch-i66726
Normal file
@ -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;
|
||||
|
||||
26
editors/openoffice-3-devel/files/patch-i66727
Normal file
26
editors/openoffice-3-devel/files/patch-i66727
Normal file
@ -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 )
|
||||
{
|
||||
17
editors/openoffice-3-devel/files/patch-i66728
Normal file
17
editors/openoffice-3-devel/files/patch-i66728
Normal file
@ -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 ) )
|
||||
17
editors/openoffice-3-devel/files/patch-i66729
Normal file
17
editors/openoffice-3-devel/files/patch-i66729
Normal file
@ -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)
|
||||
21
editors/openoffice-3-devel/files/patch-i66730
Normal file
21
editors/openoffice-3-devel/files/patch-i66730
Normal file
@ -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(":");
|
||||
@ -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 @@
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+} } }
|
||||
|
||||
21
editors/openoffice.org-2-devel/files/patch-i66726
Normal file
21
editors/openoffice.org-2-devel/files/patch-i66726
Normal file
@ -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;
|
||||
|
||||
26
editors/openoffice.org-2-devel/files/patch-i66727
Normal file
26
editors/openoffice.org-2-devel/files/patch-i66727
Normal file
@ -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 )
|
||||
{
|
||||
17
editors/openoffice.org-2-devel/files/patch-i66728
Normal file
17
editors/openoffice.org-2-devel/files/patch-i66728
Normal file
@ -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 ) )
|
||||
17
editors/openoffice.org-2-devel/files/patch-i66729
Normal file
17
editors/openoffice.org-2-devel/files/patch-i66729
Normal file
@ -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)
|
||||
21
editors/openoffice.org-2-devel/files/patch-i66730
Normal file
21
editors/openoffice.org-2-devel/files/patch-i66730
Normal file
@ -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(":");
|
||||
@ -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 @@
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+} } }
|
||||
|
||||
21
editors/openoffice.org-2.0-devel/files/patch-i66726
Normal file
21
editors/openoffice.org-2.0-devel/files/patch-i66726
Normal file
@ -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;
|
||||
|
||||
26
editors/openoffice.org-2.0-devel/files/patch-i66727
Normal file
26
editors/openoffice.org-2.0-devel/files/patch-i66727
Normal file
@ -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 )
|
||||
{
|
||||
17
editors/openoffice.org-2.0-devel/files/patch-i66728
Normal file
17
editors/openoffice.org-2.0-devel/files/patch-i66728
Normal file
@ -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 ) )
|
||||
17
editors/openoffice.org-2.0-devel/files/patch-i66729
Normal file
17
editors/openoffice.org-2.0-devel/files/patch-i66729
Normal file
@ -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)
|
||||
21
editors/openoffice.org-2.0-devel/files/patch-i66730
Normal file
21
editors/openoffice.org-2.0-devel/files/patch-i66730
Normal file
@ -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(":");
|
||||
@ -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 @@
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+} } }
|
||||
|
||||
21
editors/openoffice.org-3-devel/files/patch-i66726
Normal file
21
editors/openoffice.org-3-devel/files/patch-i66726
Normal file
@ -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;
|
||||
|
||||
26
editors/openoffice.org-3-devel/files/patch-i66727
Normal file
26
editors/openoffice.org-3-devel/files/patch-i66727
Normal file
@ -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 )
|
||||
{
|
||||
17
editors/openoffice.org-3-devel/files/patch-i66728
Normal file
17
editors/openoffice.org-3-devel/files/patch-i66728
Normal file
@ -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 ) )
|
||||
17
editors/openoffice.org-3-devel/files/patch-i66729
Normal file
17
editors/openoffice.org-3-devel/files/patch-i66729
Normal file
@ -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)
|
||||
21
editors/openoffice.org-3-devel/files/patch-i66730
Normal file
21
editors/openoffice.org-3-devel/files/patch-i66730
Normal file
@ -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(":");
|
||||
@ -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 @@
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+} } }
|
||||
|
||||
21
editors/openoffice.org-vcltesttool/files/patch-i66726
Normal file
21
editors/openoffice.org-vcltesttool/files/patch-i66726
Normal file
@ -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;
|
||||
|
||||
26
editors/openoffice.org-vcltesttool/files/patch-i66727
Normal file
26
editors/openoffice.org-vcltesttool/files/patch-i66727
Normal file
@ -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 )
|
||||
{
|
||||
17
editors/openoffice.org-vcltesttool/files/patch-i66728
Normal file
17
editors/openoffice.org-vcltesttool/files/patch-i66728
Normal file
@ -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 ) )
|
||||
17
editors/openoffice.org-vcltesttool/files/patch-i66729
Normal file
17
editors/openoffice.org-vcltesttool/files/patch-i66729
Normal file
@ -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)
|
||||
21
editors/openoffice.org-vcltesttool/files/patch-i66730
Normal file
21
editors/openoffice.org-vcltesttool/files/patch-i66730
Normal file
@ -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(":");
|
||||
Loading…
Reference in New Issue
Block a user