rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch, NONE, 1.1 openoffice.org.spec, 1.2248, 1.2249 workspace.writerfilter08.patch, 1.1, 1.2

Caolan McNamara caolanm at fedoraproject.org
Fri Jun 18 14:44:00 UTC 2010 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10610/devel

Modified Files:
	openoffice.org.spec workspace.writerfilter08.patch 
Added Files:
	openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch 
Log Message:
Resolves: rhbz#605594 openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch

openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch:
 txttab.cxx |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch ---
diff -ru sw.orig/source/core/text/txttab.cxx sw/source/core/text/txttab.cxx
--- sw.orig/source/core/text/txttab.cxx	2010-06-18 15:03:06.000000000 +0100
+++ sw/source/core/text/txttab.cxx	2010-06-18 15:30:19.000000000 +0100
@@ -194,6 +194,10 @@
             if ( nCount < 0 )
                 nCount = 0;
 
+			//Minimum tab stop width is 1
+			if (nDefTabDist <= 0)
+			    nDefTabDist = 1;
+
 			nCount /= nDefTabDist;
             nNextPos = ( nCount + 1 ) * nDefTabDist ;
             // --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:


View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.2248 -r 1.2249 openoffice.org.specIndex: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2248
retrieving revision 1.2249
diff -u -p -r1.2248 -r1.2249
--- openoffice.org.spec	16 Jun 2010 19:48:53 -0000	1.2248
+++ openoffice.org.spec	18 Jun 2010 14:43:59 -0000	1.2249
@@ -152,6 +152,7 @@ Patch81: openoffice.org-3.3.0.ooo112363.
 Patch82: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
 Patch83: workspace.gtkfpicker9.patch
 Patch84: openoffice.org-3.3.0.ooo112421.vcl.defaultmonitor.patch
+Patch85: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1717,6 +1718,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch82 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
 %patch83 -p0 -b .workspace.gtkfpicker9.patch
 %patch84 -p0 -b .ooo112421.vcl.defaultmonitor.patch
+%patch85 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4210,6 +4212,9 @@ fi
 %endif
 
 %changelog
+* Fri Jun 18 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.15
+- Resolves: rhbz#605594 openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
+
 * Tue Jun 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.14
 - run smoketest in check
 - ensure presentation-screen preview defaults to displaying on 
@@ -5140,41 +5145,41 @@ fi
 - release branch
 - drop integrated openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
 
-* Sun Aug 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-2
+* Sun Aug 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-2
 - Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
 - Resolves: rhbz#457529 reset number recognition default in writer back to 
   pre 3.0 settings. Its a stupid feature for a word processor.
 - Resolves: rhbz#457600 licences are localized apparently
 
-* Mon Jul 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-1
+* Mon Jul 28 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-1
 - next version
 - drop (finally!) integrated ooo#64726 bengali translation fix (April 2006)
 - drop integrated workspace.cmcfixes46.patch
 - Move hsqldb stuff into database rpm
 
-* Thu Jul 24 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.27-1
+* Thu Jul 24 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.27-1
 - next version
 - drop integrated workspace.native172.patch
 - drop integrated openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
 
-* Wed Jul 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-2
+* Wed Jul 23 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-2
 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
 - Resolves: rhbz#451708 ensure root certs are available for document signing
 - Resolves: rhbz#456459 3-layer OOo hits the sdk/odk again
 
-* Tue Jul 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-1
+* Tue Jul 22 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.26-1
 - next version
 - drop integrated openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 - move some libs out of core into the database module
 - Resolves: rhbz#455904 add openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
 
-* Thu Jul 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.25-1
+* Thu Jul 17 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.25-1
 - next version
 - drop integrated openoffice.org-2.4.0.ooo85448.emptyrpath.patch
 - drop inregrated openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
 - add workspace.native172.patch for ScriptFramework extention bustage
 
-* Fri Jul 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.24-1
+* Fri Jul 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.24-1
 - next version
 - drop integrated openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
 - drop integrated openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
@@ -5185,7 +5190,7 @@ fi
   inconsistent, unnecessarily complicated, redundant and nigh universially 
   hated arch-dependant naming scheme for presenter-screen extension 
 
-* Mon Jul 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-1
+* Mon Jul 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-1
 - next version
 - drop integrated openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
 - drop integrated openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
@@ -5196,7 +5201,7 @@ fi
   => bsh now only required by beanshell ScriptProvider
 - extend selinux bodge to m68k
 
-* Tue Jul 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-1
+* Tue Jul 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-1
 - next version
 - drop integrated pseudoworkspace.valgrind1.patch
 - drop integrated openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
@@ -5204,7 +5209,7 @@ fi
 - add workspace.ab55.patch
 - Resolves: rhbz#453487 some font packages now gone
 
-* Thu Jun 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
+* Thu Jun 26 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
 - next version
 - Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 - Resolves: rhbz#448464 openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
@@ -5217,32 +5222,32 @@ fi
 - drop integrated openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
 - add openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
 
-* Wed Jun 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
+* Wed Jun 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
 - next version
 - add openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
 
-* Mon Jun 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.18-1
+* Mon Jun 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.18-1
 - next version
 - drop integrated openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
 - drop integrated openoffice.org-3.0.0.ooo88815.oox.parallel.patch
 
-* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-2
+* Fri Jun 06 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-2
 - Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
 
-* Thu Jun 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-1
+* Thu Jun 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-1
 - next version 
 - drop integrated openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
 
-* Thu Jun 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-2
+* Thu Jun 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-2
 - still fighting the sdk
 
-* Wed Jun 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-1
+* Wed Jun 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-1
 - next version
 - add openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
 - add openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
 - Resolves: rhbz#449804 fix Requires
 
-* Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.15-1
+* Tue Jun 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.15-1
 - next version
 - add openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch for building against
   3 layer OOo
@@ -5252,7 +5257,7 @@ fi
   -Os on i386
 - Resolves: rhbz#448553 add openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
 
-* Wed May 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
+* Wed May 28 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
 - next version
 - Require new hunspell-ml for Malayalam langpack
 - drop integrated openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
@@ -5261,7 +5266,7 @@ fi
 - Resolves: rhbz#445588 add openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
 - add openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
 
-* Mon May 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-1
+* Mon May 19 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-1
 - next version
 - drop integrated openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
 - drop integrated openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
@@ -5271,14 +5276,14 @@ fi
 - drop integrated workspace.ucpgio1.patch
 - drop integrated openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
 
-* Fri May 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.2
+* Fri May 16 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.2
 - I misspelled the damn Requires
 
-* Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.1
+* Fri May 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.1
 - next version
 - re-add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
-* Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
+* Fri May 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
 - next version
 - drop integrated workspace.cmcfixes43.patch
 - drop integrated openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
@@ -5292,7 +5297,7 @@ fi
 - tidy configure line through --with-system-libs --with-system-headers
 - drop sequence check patch and use .xcu configuration
 
-* Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
+* Wed Apr 30 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
 - next version
 - drop integrated openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
 - drop integrated openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
@@ -5304,13 +5309,13 @@ fi
 - Resolves: rhbz#444571 add openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
 - add workspace.ucpgio1.patch and disable gnome-vfs
 
-* Mon Apr 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.9.1
[...1679 lines suppressed...]
 - add openoffice.org-1.9.92.ooo47641.pptmimetype.patch
 - Fix GTK combo box button sizes (dcbw)
 
-* Wed Apr 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.92-3
+* Wed Apr 13 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.92-3
 - rh#153229# add multiple Obsoletes
 
-* Mon Apr 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.92-2
+* Mon Apr 11 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.92-2
 - add some indic translations, but leave disabled for now
 - push ooo#46388# sot fix
 - drop perl-Archive-Zip buildtime copy
 
-* Mon Apr 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.92-1
+* Mon Apr 11 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.92-1
 - bump to next version
 - drop integrated workspace-gcj4.patch
 - drop openoffice.org-1.9.80.ooo43466.wmclass.patch 
   g_set_application() name called multiple times
 - drop integrated openoffice.org-1.9.91.ooo46603.boost.sd.patch
 
-* Mon Apr 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.91-2
+* Mon Apr 11 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.91-2
 - scripting framework builds with gcj now
 
-* Fri Apr 8 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.91-1
+* Fri Apr 8 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.91-1
 - bump to latest version
 - have to reverse move to db4 because of rh#153231#
 - drop integrated workspace-systemmozilla
@@ -7099,11 +7104,11 @@ experimentation
 - happy birthday to me
 - add openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
 
-* Wed Apr 5 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.89-5
+* Wed Apr 5 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.89-5
 - ooo#46850# libscui680* apparently in the wrong subpackage
 - upstream patches to hsqldb b0rk gcj
 
-* Tue Apr 5 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.89-4
+* Tue Apr 5 2005 Caolán McNamara <caolanm at redhat.com> - 1:1.9.89-4
 - rh#153129# Requires won't work for x86_64
 - rh#152269# Reported problems with nfs file locking
 - add openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
@@ -7112,7 +7117,7 @@ experimentation
 * Mon Apr 4 2005 Elliot Lee <sopwith at redhat.com> - 1:1.9.89-3
 - Slim down the langpacks
 
-* Sat Apr 2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.89-2
+* Sat Apr 2 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.89-2
 - package the wizard jars (doh!)
 - fix the fpic icudata issue properly
 - enthused by parallized build success try parallized build.pl as well as dmake
@@ -7120,13 +7125,13 @@ experimentation
 - damn ppc gives illegal instruction on sysui mandrake menus which it didn't
   in the last build. I couldn't be bothered wasting my time figuring out why
 
-* Thu Mar 31 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.89-1
+* Thu Mar 31 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.89-1
 - bump to 1.9.89
 - drop integrated openoffice.org-1.9.83.ooo43995.wptypedetect.patch
 - drop hsqldb backport from 1.9.89 now
 - add more parallel build patches as we go along
 
-* Tue Mar 29 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.88-5
+* Tue Mar 29 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.88-5
 - new wzi.res
 - ooo#46217# allow fallback to en_US from other english, i.e. en_IE, en_GB etc
 - replace openoffice.org-1.9.87.NONE.wizards.broken.patch with
@@ -7145,7 +7150,7 @@ experimentation
 * Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 1:1.9.88-2
 - Update the GTK+ theme icon cache on (un)install
 
-* Tue Mar 22 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.88-1
+* Tue Mar 22 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.88-1
 - bump to 1.9.88
 - submit openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch upstream
 - drop integrated openoffice.org-1.9.87.ooo43538.sfx2.patch
@@ -7154,11 +7159,11 @@ experimentation
 - allow switching spec to build with gcc3 and gcj4, kudos Fridrich Strba
 - jump to hsqldb 1.8.0RC9 in advance of 1.9.89 to fix our hsqldb issues
 
-* Tue Mar 22 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.87-2
+* Tue Mar 22 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.87-2
 - unpackaged libraries
 - try out more lenient LOCALE acceptence for rh#151357#
 
-* Sat Mar 19 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.87-1
+* Sat Mar 19 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.87-1
 - bump to latest version
 - rh#151356# stick to 2.0 pathname to keep user settings during pre-release cycle
 - drop integrated workspace-gcj3.patch
@@ -7175,27 +7180,27 @@ experimentation
 - backport openoffice.org-1.9.87.ooo43538.sfx2.patch for rh#151594#
 - add requires on appropiate fonts for some langpacks
 
-* Tue Mar 15 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.85-1
+* Tue Mar 15 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.85-1
 - bump to latest version
 - add the contrib non-core dictionaries, and allow them to be split up 
   between the languagepacks
 - use gcj-dbtool during build
 
-* Wed Mar 09 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.84-1
+* Wed Mar 09 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.84-1
 - bump to 1.9.84
 - describe what language is in which langpack, drop some unsupported ones
 - ppc should build hsqldb now
 - disable qadevOOo for now until gcj3 workspace is fully integrated
 - gcc20465 breaks ooo build
 
-* Fri Mar 04 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.83-1
+* Fri Mar 04 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.83-1
 - bump to 1.9.83
 - drop integrated workspace.gcj2
 - add Requires for libwpd which is now pulled in from the system
 - add openoffice.org-1.9.83.ooo43995.wptypedetect.patch
 - add openoffice.org-1.9.83.ooo44377.icunotusingfpic.patch because icudata isn't being compiled with -fpic
 
-* Fri Mar 04 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.82-1
+* Fri Mar 04 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.82-1
 - bump to 1.9.82
 - drop integrated openoffice.org-1.9.75.ooo42251.copyright.patch
 - drop integrated workspace-systempython2.patch
@@ -7203,7 +7208,7 @@ experimentation
 - drop integrated openoffice.org-1.9.77.ooo42457.ppclink.patch
 - add openoffice.org-1.9.82.NONE.noznow.patch no -z now under ppc
 
-* Wed Mar 02 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.81-1
+* Wed Mar 02 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.81-1
 - bump to 1.9.81
 - drop integrated openoffice.org-1.9.77.ooo42152.gnomevfs.patch
 - with --with-system-stdlibs
@@ -7214,24 +7219,24 @@ experimentation
 - sc needs another file in exceptions because of system-boost
 - drop integrated ooo#43297#
 
-* Wed Mar 02 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.80-1
+* Wed Mar 02 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.80-1
 - move to openoffice.org
 - gcc4 patch
 
-* Tue Mar 01 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.80-4
+* Tue Mar 01 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.80-4
 - new ms-langpack
 - bump from libgcj4 to libgcj >= 4.0.0
 - so drop fc4uselibgcj_fc4 patch
 
-* Mon Feb 28 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.80-3
+* Mon Feb 28 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.80-3
 - reenable langpacks
 - ignore missing localized files, rather than copying the english version
 
-* Mon Feb 28 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.80-2
+* Mon Feb 28 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.80-2
 - disable langpacks
 - hsqldb is apparently buildable with gcj4 now (except under ppc!)
 
-* Thu Feb 25 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.80-1
+* Thu Feb 25 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.80-1
 - bump to latest release
 - drop integrated rpath workspace
 - slideshow gcc internal error worked around elsewhere
@@ -7239,29 +7244,29 @@ experimentation
 - drop integrated pyunofixes1 workspace
 - add ooo#43297# chart2 build fix
 
-* Mon Feb 21 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.77-3
+* Mon Feb 21 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.77-3
 - add extra langpacks
 
-* Fri Feb 11 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.77-2
+* Fri Feb 11 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.77-2
 - add new installed but unpackaged files
 - haul in the .desktops and icons
 
-* Tue Feb 8 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.77-1
+* Tue Feb 8 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.77-1
 - drop integrated ooo#40937# doublefree patch
 - drop redundant gcj awt without display patch
 - drop redundant missingapp patch
 - seperate pyuno package with all the goodies from pyunofixes1 and systempython2
 
-* Thu Feb 3 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.75-2
+* Thu Feb 3 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.75-2
 - gcc ppc visibility and inlines are not working correctly
 
-* Wed Feb 2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.75-1
+* Wed Feb 2 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.75-1
 - bump to next version
 - drop integrated gcj1 workspace
 - drop integrated systempython workspace
 
-* Wed Feb 2 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.73-2
+* Wed Feb 2 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.73-2
 - crash on exit, correct options for oofoo2 scripts
 
-* Wed Jan 26 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.73-1
+* Wed Jan 26 2005 Caolán McNamara <caolanm at redhat.com> 1:1.9.73-1
 - initial import of the levithan

workspace.writerfilter08.patch:
 OOXMLFactory.cxx            |   10 ++++++++--
 OOXMLFastContextHandler.cxx |    3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

Index: workspace.writerfilter08.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.writerfilter08.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.writerfilter08.patch	4 Jun 2010 12:12:52 -0000	1.1
+++ workspace.writerfilter08.patch	18 Jun 2010 14:44:00 -0000	1.2
@@ -21,11 +21,12 @@ diff -ru writerfilter.orig/source/ooxml/
 diff -ru writerfilter.orig/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
 --- writerfilter.orig/source/ooxml/OOXMLFastContextHandler.cxx	2010-06-02 09:46:43.000000000 +0100
 +++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx	2010-06-02 10:11:28.000000000 +0100
-@@ -152,12 +152,12 @@
+@@ -152,12 +154,13 @@
  (OOXMLFastContextHandler * pContext)
  : cppu::WeakImplHelper1<com::sun::star::xml::sax::XFastContextHandler>(),
    mpParent(pContext),
 +  mId(0),
++  mnDefine(0),
    mnToken(OOXML_FAST_TOKENS_END),
    mpStream(NULL),
    mnTableDepth(0),

More information about the scm-commits mailing list