rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch, NONE, 1.1 openoffice.org.spec, 1.1420, 1.1421

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch 
Log Message:
Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch

openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch:

--- NEW FILE openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch ---
Index: source/dialog/multipat.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/multipat.cxx,v
retrieving revision 1.11
diff -u -r1.11 multipat.cxx
--- openoffice.org.orig/svx/source/dialog/multipat.cxx	27 Jun 2007 17:22:03 -0000	1.11
+++ openoffice.org/svx/source/dialog/multipat.cxx	7 Feb 2008 08:54:15 -0000
@@ -138,7 +138,7 @@
         if ( pImpl->bIsRadioButtonMode )
         {
             ULONG nPos = aRadioLB.GetEntryPos( sInsPath, 1 );
-            if ( (ULONG)-1 == nPos )
+            if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos
             {
                 String sNewEntry( '\t' );
                 sNewEntry += sInsPath;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1420
retrieving revision 1.1421
diff -u -r1.1420 -r1.1421
--- openoffice.org.spec	6 Feb 2008 16:39:46 -0000	1.1420
+++ openoffice.org.spec	7 Feb 2008 09:01:17 -0000	1.1421
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 6
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -139,6 +139,7 @@
 Patch65: workspace.gcc430two.patch
 Patch66: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
 Patch67: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch68: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1092,6 +1093,7 @@
 %patch65 -p1 -b .workspace.gcc430two.patch
 %patch66 -p1 -b .ooo85854.sw.graphicsaveas.patch
 %patch67 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch68 -p1 -b .ooo85931.svx.getentrypos.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2858,6 +2860,9 @@
 
 
 %changelog
+* Thu Feb 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-6.3
+- Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
+
 * Tue Feb 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-6.2
 - fix problem with mixed fontsizes with same font face
 - resync workspace.notes2.patch