rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch, NONE, 1.1 openoffice.org.spec, 1.1263, 1.1264 openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch, 1.1, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25888

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch 
Removed Files:
	openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch 
Log Message:
use upstream id

openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch:

--- NEW FILE openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch ---
Index: source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx,v
retrieving revision 1.2
diff -u -r1.2 ChangeRequestQueueProcessor.hxx
--- openoffice.org.orig/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx	3 Apr 2007 15:44:28 -0000	1.2
+++ openoffice.org/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx	20 Aug 2007 15:05:32 -0000
@@ -109,7 +109,7 @@
         so that a pending user event can be removed whent he queue processor
         is destroyed.
     */
-    sal_uInt32 mnUserEventId;
+    ULONG mnUserEventId;
     
     ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::framework::XConfiguration> mxConfiguration;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1263
retrieving revision 1.1264
diff -u -r1.1263 -r1.1264
--- openoffice.org.spec	22 Aug 2007 12:29:40 -0000	1.1263
+++ openoffice.org.spec	22 Aug 2007 14:20:37 -0000	1.1264
@@ -127,7 +127,7 @@
 Patch62: workspace.npower7.patch
 Patch63: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch64: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch65: openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
+Patch65: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define instdir %{_libdir}/openoffice.org
@@ -1067,7 +1067,7 @@
 %patch62 -p1 -b .workspace.npower7.patch
 %patch63 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch64 -p1 -b .ooo80735.cppu.map.patch
-%patch65 -p1 -b .oooXXXXX.sd.sixtyfour.patch
+%patch65 -p1 -b .ooo80944.sd.sixtyfour.patch
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %if %{linkopt}
@@ -2740,7 +2740,7 @@
   + add workspace.npower7.patch for build failure
   + add openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch for build failure
   + add openoffice.org-2.3.0.ooo80735.cppu.map.patch for ppc64
-  + add openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
+  + add openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
   + add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch for pesky ppc64 
     install failure
   + replace openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch


--- openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch DELETED ---