rpms/openoffice.org/devel workspace.sw8u10bf04.patch, NONE, 1.1 openoffice.org.spec, 1.1390, 1.1391 sources, 1.262, 1.263

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Added Files:
	workspace.sw8u10bf04.patch 
Log Message:
new sources

workspace.sw8u10bf04.patch:

--- NEW FILE workspace.sw8u10bf04.patch ---
Index: source/core/txtnode/thints.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/txtnode/thints.cxx,v
retrieving revision 1.57
diff -u -r1.57 thints.cxx
--- openoffice.org.orig/sw/source/core/txtnode/thints.cxx	12 Dec 2007 13:24:49 -0000	1.57
+++ openoffice.org/sw/source/core/txtnode/thints.cxx	16 Jan 2008 09:30:02 -0000
@@ -1950,13 +1957,13 @@
         const SwTxtAttr* pOtherHt = rHints[i];
 
         const xub_StrLen nOtherStart = *pOtherHt->GetStart();
-        const xub_StrLen nOtherEnd = *pOtherHt->GetEnd();
 
         if ( nOtherStart > nHtStart )
             break;
 
         if ( RES_TXTATR_CHARFMT == pOtherHt->Which() )
         {
+            const xub_StrLen nOtherEnd = *pOtherHt->GetEnd();
             if ( nOtherStart == nHtStart && nOtherEnd == nHtEnd )
             {
                 const USHORT nOtherSortNum = static_cast<const SwTxtCharFmt*>(pOtherHt)->GetSortNumber();


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1390
retrieving revision 1.1391
diff -u -r1.1390 -r1.1391
--- openoffice.org.spec	15 Jan 2008 20:54:34 -0000	1.1390
+++ openoffice.org.spec	16 Jan 2008 11:27:12 -0000	1.1391
@@ -1,6 +1,6 @@
 %define oootag OOH680
-%define ooomilestone 2
-%define rh_rpm_release 2
+%define ooomilestone 3
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -137,6 +137,7 @@
 Patch63: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
 Patch64: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
 Patch65: openoffice.org-2.4.0.ooo83410.solenv.renameserbian.patch
+Patch66: workspace.sw8u10bf04.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1088,6 +1089,7 @@
 %patch63 -p1
 %patch64 -p1 -b .rh133741.alwaysgtk.vcl.patch
 %patch65 -p1 -b .ooo83410.solenv.renameserbian.patch
+%patch66 -p1 -b .workspace.sw8u10bf04.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -2862,6 +2864,9 @@
 
 
 %changelog
+* Wed Jan 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.1
+- Resolves: rhbz#428655 workspace.sw8u10bf04.patch
+
 * Tue Jan 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-2.2
 - fix hyphenation
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- sources	16 Jan 2008 11:25:35 -0000	1.262
+++ sources	16 Jan 2008 11:27:12 -0000	1.263
@@ -4,5 +4,4 @@
 05a906513ef89af5e189097fa0c50681  ooo64726.sdf
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
-75056e0f20f7a7f4c1db9e0d3838d92b  OOH680_m2.tar.bz2
 c46bd62e569470d0d1e6b807daf6ff17  OOH680_m3.tar.bz2