rpms/openoffice.org/devel openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.3, 1.4 openoffice.org.spec, 1.982, 1.983 openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 11:00:27 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12442
Modified Files:
openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
openoffice.org.spec
Removed Files:
openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
Log Message:
merge double free into system-db which is why it was needed anyway
openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch:
openoffice.org/xmlhelp/source/com/sun/star/help/HelpDatabases.java | 80 +++++-----
openoffice.org/xmlhelp/source/com/sun/star/help/HelpIndexer.java | 57 ++++---
openoffice.org/xmlhelp/source/com/sun/star/help/HelpKeyword.java | 10 -
openoffice.org/xmlhelp/source/com/sun/star/help/HelpLinker.java | 45 +++--
openoffice.org/xmlhelp/source/com/sun/star/help/HelpURLParameter.java | 32 ++--
openoffice.org/xmlhelp/source/com/sun/star/help/StringDbt.java | 24 +--
source/cxxhelp/qe/Search.cxx | 0
xmlhelp/source/cxxhelp/qe/Search.cxx | 3
8 files changed, 136 insertions(+), 115 deletions(-)
Index: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch 15 Feb 2006 08:30:43 -0000 1.3
+++ openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch 19 Dec 2006 11:00:22 -0000 1.4
@@ -585,3 +585,23 @@
}
private void addEntryToJarFile(
+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/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -r1.982 -r1.983
--- openoffice.org.spec 19 Dec 2006 10:06:41 -0000 1.982
+++ openoffice.org.spec 19 Dec 2006 11:00:22 -0000 1.983
@@ -96,35 +96,34 @@
Patch28: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
Patch29: ooobuild.VBAObjects.patch
Patch30: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch31: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch32: workspace.os89.patch
-Patch33: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch34: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch35: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch36: pseudoworkspace.valgrind1.patch
-Patch37: workspace.thbpp6.patch
-Patch38: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch39: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch40: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
-Patch41: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch42: workspace.aw024.patch
-Patch43: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch44: workspace.dr51.patch
-Patch45: openoffice.org-2.0.4.rh213710.vba.patch
-Patch46: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch47: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch48: workspace.sixtyfour09.patch
-Patch49: workspace.vcl69.patch
-Patch50: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch51: workspace.dba22b.patch
-Patch52: workspace.sixtyfour10.patch
-Patch53: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch54: workspace.vcl70.patch
-Patch55: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch56: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch57: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch58: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
-Patch59: workspace.vcl71.patch
+Patch31: workspace.os89.patch
+Patch32: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch33: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch34: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch35: pseudoworkspace.valgrind1.patch
+Patch36: workspace.thbpp6.patch
+Patch37: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch38: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch39: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
+Patch40: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch41: workspace.aw024.patch
+Patch42: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch43: workspace.dr51.patch
+Patch44: openoffice.org-2.0.4.rh213710.vba.patch
+Patch45: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch46: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch47: workspace.sixtyfour09.patch
+Patch48: workspace.vcl69.patch
+Patch49: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch50: workspace.dba22b.patch
+Patch51: workspace.sixtyfour10.patch
+Patch52: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch53: workspace.vcl70.patch
+Patch54: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch55: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch56: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch57: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch58: workspace.vcl71.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -958,35 +957,34 @@
%patch28 -p1 -b .rh187919.gtkunderkde.patch
%patch29 -p0 -b .ooobuild.VBAObjects.patch
%patch30 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch31 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch32 -p1 -b .workspace.os89.patch
-%patch33 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch34 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch35 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch36 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch37 -p1 -b .workspace.thbpp6.patch
-%patch38 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch39 -p1 -b .rh217065.syncbackspace.patch
-%patch40 -p1 -b .ooo70779.vcl.setprgname.patch
-%patch41 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch42 -p1 -b .workspace.aw024.patch
-%patch43 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch44 -p1 -b .workspace.dr51.patch
-%patch45 -p1 -b .rh213710.vba.patch
-%patch46 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch47 -p1 -b .ooo61812.svx.a11ycrash.patch
-%patch48 -p1 -b .workspace.sixtyfour09.patch
-%patch49 -p1 -b .workspace.vcl69.patch
-cat %{PATCH50} >> svtools/source/dialogs/localize.sdf
-%patch51 -p1 -b .workspace.dba22b.patch
-%patch52 -p1 -b .workspace.sixtyfour10.patch
-%patch53 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch54 -p1 -b .workspace.vcl70.patch
-%patch55 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch56 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch57 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch58 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
-%patch59 -p1 -b .workspace.vcl71.patch
+%patch31 -p1 -b .workspace.os89.patch
+%patch32 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch33 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch34 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch35 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch36 -p1 -b .workspace.thbpp6.patch
+%patch37 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch38 -p1 -b .rh217065.syncbackspace.patch
+%patch39 -p1 -b .ooo70779.vcl.setprgname.patch
+%patch40 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch41 -p1 -b .workspace.aw024.patch
+%patch42 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch43 -p1 -b .workspace.dr51.patch
+%patch44 -p1 -b .rh213710.vba.patch
+%patch45 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch46 -p1 -b .ooo61812.svx.a11ycrash.patch
+%patch47 -p1 -b .workspace.sixtyfour09.patch
+%patch48 -p1 -b .workspace.vcl69.patch
+cat %{PATCH49} >> svtools/source/dialogs/localize.sdf
+%patch50 -p1 -b .workspace.dba22b.patch
+%patch51 -p1 -b .workspace.sixtyfour10.patch
+%patch52 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch53 -p1 -b .workspace.vcl70.patch
+%patch54 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch55 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch56 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch57 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch58 -p1 -b .workspace.vcl71.patch
%if %{langpacks}
tar xzf %{SOURCE1}
--- openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch DELETED ---
More information about the fedora-cvs-commits
mailing list