rpms/openoffice.org/devel openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch, NONE, 1.1 openoffice.org.spec, 1.1231, 1.1232 openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.4, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch 
Removed Files:
	openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch 
Log Message:
update upstream ids

openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch:

--- NEW FILE openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch ---
Index: source/cxxhelp/qe/Search.cxx
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/qe/Search.cxx,v
retrieving revision 1.7
diff -u -r1.7 Search.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/qe/Search.cxx	9 Sep 2005 12:23:53 -0000	1.7
+++ openoffice.org/xmlhelp/source/cxxhelp/qe/Search.cxx	25 Jul 2006 07:47:28 -0000
@@ -473,10 +473,11 @@
 		genHeap_.reset();
     }
 	while( nextDocGenHeap_.isNonEmpty() );
-
+#if 0
 	for( sal_uInt32 i = 0; i < start.size(); ++i )
 		if( start[i] != RoleFiller::STOP() )
 			delete start[i];
+#endif
 }
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1231
retrieving revision 1.1232
diff -u -r1.1231 -r1.1232
--- openoffice.org.spec	27 Jul 2007 15:48:39 -0000	1.1231
+++ openoffice.org.spec	1 Aug 2007 12:15:17 -0000	1.1232
@@ -83,7 +83,7 @@
 Patch18: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch19: openoffice.org-1.9.129.ooo54603.fontconfig.patch
 Patch20: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch21: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch21: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
 Patch22: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
 Patch23: workspace.libxslt02.patch
 Patch24: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
@@ -151,8 +151,8 @@
 Patch86: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
 Patch87: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
 Patch88: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
-Patch89: openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.patch
-Patch90: openoffice.org-2.3.0.oooXXXXX.sd.textonlystyle.tar.gz
+Patch89: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch90: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1026,7 +1026,7 @@
 %patch18 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch19 -p1 -b .ooo54603.fontconfig.patch
 %patch20 -p1 -b .ooo51931.fixxmlsec.patch
-%patch21 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch21 -p1 -b .ooo67740.doublefree.xmlhelp.patch
 %patch22 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
 %patch23 -p1 -b .workspace.libxslt02.patch
 %patch24 -p1 -b .ooo58606.sw.pre-edit.patch
@@ -1098,7 +1098,7 @@
 %patch86 -p1 -b .ooo79481.sw.rowordcount.patch
 %patch87 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
 %patch88 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-%patch89 -p1 -b .oooXXXXX.sd.textonlystyle.patch
+%patch89 -p1 -b .ooo80257.sd.textonlystyle.patch
 tar xzf %{PATCH90}
 
 %if %{linkopt}


--- openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch DELETED ---