rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch, 1.2, 1.3 openoffice.org.spec, 1.930, 1.931

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31196

Modified Files:
	openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch 
	openoffice.org.spec 
Log Message:
more openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch

openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch:
 binfilter/bf_sc/source/core/tool/sc_rechead.cxx |    4 ++--
 binfilter/bf_svx/source/items/svx_flditem.cxx   |    2 +-
 extensions/source/packer/packer2.hxx            |    2 +-
 svtools/source/items1/poolio.cxx                |    2 +-
 svtools/source/numbers/numhead.cxx              |    4 ++--
 svx/source/items/flditem.cxx                    |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

Index: openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch	22 Feb 2007 20:25:55 -0000	1.2
+++ openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch	23 Feb 2007 09:03:28 -0000	1.3
@@ -53,3 +53,34 @@
  		rStream << nDataSize;						// Groesse am Anfang eintragen
  		rStream.Seek(nPos);
  	}
+--- openoffice.org.orig/binfilter/bf_sc/source/core/tool/sc_rechead.cxx	2006-10-27 16:37:48.000000000 +0200
++++ openoffice.org/binfilter/bf_sc/source/core/tool/sc_rechead.cxx	2007-02-22 19:07:47.000000000 +0100
+@@ -98,7 +98,7 @@ namespace binfilter {
+ /*N*/ 	if ( nPos - nDataPos != nDataSize )				// Default getroffen?
+ /*N*/ 	{
+ /*N*/ 		nDataSize = nPos - nDataPos;
+-/*N*/ 		rStream.Seek(nDataPos - sizeof(ULONG));
++/*N*/ 		rStream.Seek(nDataPos - sizeof(sal_uInt32));
+ /*N*/ 		rStream << nDataSize;						// Groesse am Anfang eintragen
+ /*N*/ 		rStream.Seek(nPos);
+ /*N*/ 	}
+@@ -214,7 +214,7 @@ namespace binfilter {
+ /*N*/ 	{
+ /*N*/ 		nDataSize = nDataEnd - nDataPos;
+ /*N*/ 		ULONG nPos = rStream.Tell();
+-/*N*/ 		rStream.Seek(nDataPos-sizeof(ULONG));
++/*N*/ 		rStream.Seek(nDataPos-sizeof(sal_uInt32));
+ /*N*/ 		rStream << nDataSize;								// Groesse am Anfang eintragen
+ /*N*/ 		rStream.Seek(nPos);
+ /*N*/ 	}
+--- openoffice.org.orig/binfilter/bf_svx/source/items/svx_flditem.cxx	2006-10-27 23:15:22.000000000 +0200
++++ openoffice.org/binfilter/bf_svx/source/items/svx_flditem.cxx	2007-02-22 19:06:25.000000000 +0100
+@@ -403,7 +403,7 @@ namespace binfilter {
+ /*N*/ {
+ /*N*/ 	USHORT nFormat;
+ /*N*/ 	sal_uInt32 nFrameMarker, nCharSetMarker;
+-/*N*/ 	long nUlongSize = (long)sizeof(ULONG);
++/*N*/ 	long nUlongSize = (long)sizeof(sal_uInt32);
+ /*N*/ 	String aTmpURL;
+ /*N*/ 
+ /*N*/ 	rStm >> nFormat;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- openoffice.org.spec	22 Feb 2007 20:25:55 -0000	1.930
+++ openoffice.org.spec	23 Feb 2007 09:03:28 -0000	1.931
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.13
+%define rh_rpm_release 5.14
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2581,7 +2581,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Feb 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.13
+* Thu Feb 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.14
 - add openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch
 
 * Fri Feb 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.11