build fix for amd64.

see http://www.openoffice.org/issues/show_bug.cgi?id=68110
for details.

Submitted by:	jack low

5 files changed, 125 insertions, 0 deletions

diff --git a/editors/openoffice-3-devel/files/patch-i68110 b/editors/openoffice-3-devel/files/patch-i68110
new file mode 100644
index 000000000000..f1322eec397f
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i68110
@@ -0,0 +1,25 @@
+Index: tools/bootstrp/sstring.cxx
+===================================================================
+RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 sstring.cxx
+--- tools/bootstrp/sstring.cxx	2 Aug 2006 12:10:04 -0000	1.6
++++ tools/bootstrp/sstring.cxx	10 Aug 2006 08:50:06 -0000
+@@ -173,7 +173,7 @@
+ 
+ SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
+ {
+-	ULONG nListCount;
++        sal_uInt32 nListCount;
+ 	rStream >> nListCount;
+ 	for ( USHORT i = 0; i < nListCount; i++ ) { 
+         ByteString* pByteString = new ByteString();
+@@ -185,7 +185,7 @@
+ 
+ SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
+ {
+-	ULONG nListCount = Count();
++        sal_uInt32 nListCount = Count();
+ 	rStream << nListCount;
+ 	ByteString* pByteString = First();
+ 	while (pByteString) {
diff --git a/editors/openoffice.org-2-devel/files/patch-i68110 b/editors/openoffice.org-2-devel/files/patch-i68110
new file mode 100644
index 000000000000..f1322eec397f
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i68110
@@ -0,0 +1,25 @@
+Index: tools/bootstrp/sstring.cxx
+===================================================================
+RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 sstring.cxx
+--- tools/bootstrp/sstring.cxx	2 Aug 2006 12:10:04 -0000	1.6
++++ tools/bootstrp/sstring.cxx	10 Aug 2006 08:50:06 -0000
+@@ -173,7 +173,7 @@
+ 
+ SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
+ {
+-	ULONG nListCount;
++        sal_uInt32 nListCount;
+ 	rStream >> nListCount;
+ 	for ( USHORT i = 0; i < nListCount; i++ ) { 
+         ByteString* pByteString = new ByteString();
+@@ -185,7 +185,7 @@
+ 
+ SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
+ {
+-	ULONG nListCount = Count();
++        sal_uInt32 nListCount = Count();
+ 	rStream << nListCount;
+ 	ByteString* pByteString = First();
+ 	while (pByteString) {
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i68110 b/editors/openoffice.org-2.0-devel/files/patch-i68110
new file mode 100644
index 000000000000..f1322eec397f
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-i68110
@@ -0,0 +1,25 @@
+Index: tools/bootstrp/sstring.cxx
+===================================================================
+RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 sstring.cxx
+--- tools/bootstrp/sstring.cxx	2 Aug 2006 12:10:04 -0000	1.6
++++ tools/bootstrp/sstring.cxx	10 Aug 2006 08:50:06 -0000
+@@ -173,7 +173,7 @@
+ 
+ SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
+ {
+-	ULONG nListCount;
++        sal_uInt32 nListCount;
+ 	rStream >> nListCount;
+ 	for ( USHORT i = 0; i < nListCount; i++ ) { 
+         ByteString* pByteString = new ByteString();
+@@ -185,7 +185,7 @@
+ 
+ SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
+ {
+-	ULONG nListCount = Count();
++        sal_uInt32 nListCount = Count();
+ 	rStream << nListCount;
+ 	ByteString* pByteString = First();
+ 	while (pByteString) {
diff --git a/editors/openoffice.org-3-devel/files/patch-i68110 b/editors/openoffice.org-3-devel/files/patch-i68110
new file mode 100644
index 000000000000..f1322eec397f
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i68110
@@ -0,0 +1,25 @@
+Index: tools/bootstrp/sstring.cxx
+===================================================================
+RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 sstring.cxx
+--- tools/bootstrp/sstring.cxx	2 Aug 2006 12:10:04 -0000	1.6
++++ tools/bootstrp/sstring.cxx	10 Aug 2006 08:50:06 -0000
+@@ -173,7 +173,7 @@
+ 
+ SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
+ {
+-	ULONG nListCount;
++        sal_uInt32 nListCount;
+ 	rStream >> nListCount;
+ 	for ( USHORT i = 0; i < nListCount; i++ ) { 
+         ByteString* pByteString = new ByteString();
+@@ -185,7 +185,7 @@
+ 
+ SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
+ {
+-	ULONG nListCount = Count();
++        sal_uInt32 nListCount = Count();
+ 	rStream << nListCount;
+ 	ByteString* pByteString = First();
+ 	while (pByteString) {
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i68110 b/editors/openoffice.org-vcltesttool/files/patch-i68110
new file mode 100644
index 000000000000..f1322eec397f
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i68110
@@ -0,0 +1,25 @@
+Index: tools/bootstrp/sstring.cxx
+===================================================================
+RCS file: /cvs/util/tools/bootstrp/sstring.cxx,v
+retrieving revision 1.6
+diff -u -r1.6 sstring.cxx
+--- tools/bootstrp/sstring.cxx	2 Aug 2006 12:10:04 -0000	1.6
++++ tools/bootstrp/sstring.cxx	10 Aug 2006 08:50:06 -0000
+@@ -173,7 +173,7 @@
+ 
+ SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
+ {
+-	ULONG nListCount;
++        sal_uInt32 nListCount;
+ 	rStream >> nListCount;
+ 	for ( USHORT i = 0; i < nListCount; i++ ) { 
+         ByteString* pByteString = new ByteString();
+@@ -185,7 +185,7 @@
+ 
+ SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
+ {
+-	ULONG nListCount = Count();
++        sal_uInt32 nListCount = Count();
+ 	rStream << nListCount;
+ 	ByteString* pByteString = First();
+ 	while (pByteString) {